You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/01/27 19:01:30 UTC
(causeway) branch master updated: CAUSEWAY-3676: remove unused imports (part2)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new a77d893e7c CAUSEWAY-3676: remove unused imports (part2)
a77d893e7c is described below
commit a77d893e7c8d719f946c7c60821310e49f75ea90
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat Jan 27 20:01:25 2024 +0100
CAUSEWAY-3676: remove unused imports (part2)
---
.../viewer/graphql/model/context/Context.java | 10 +---
.../viewer/graphql/model/domain/GqlvAction.java | 29 ++++++-----
.../graphql/model/domain/GqlvActionInvoke.java | 25 +++++-----
.../graphql/model/domain/GqlvActionParam.java | 13 ++---
.../model/domain/GqlvActionParamAutoComplete.java | 57 ++++++++++------------
.../model/domain/GqlvActionParamChoices.java | 18 +++----
.../model/domain/GqlvActionParamDefault.java | 43 ++++++++--------
.../model/domain/GqlvActionParamDisabled.java | 9 ++--
.../model/domain/GqlvActionParamHidden.java | 9 ++--
.../model/domain/GqlvActionParamValidate.java | 9 ++--
.../graphql/model/domain/GqlvActionParams.java | 21 ++++----
.../graphql/model/domain/GqlvActionValidity.java | 12 ++---
.../graphql/model/domain/GqlvAssociationGet.java | 7 ++-
.../graphql/model/domain/GqlvCollection.java | 6 +--
.../graphql/model/domain/GqlvCollectionGet.java | 6 +--
.../graphql/model/domain/GqlvDomainObject.java | 17 ++++---
.../graphql/model/domain/GqlvDomainService.java | 13 ++---
.../viewer/graphql/model/domain/GqlvMember.java | 4 +-
.../graphql/model/domain/GqlvMemberDisabled.java | 9 ++--
.../graphql/model/domain/GqlvMemberHidden.java | 9 ++--
.../viewer/graphql/model/domain/GqlvMeta.java | 15 +++---
.../viewer/graphql/model/domain/GqlvProperty.java | 12 +++--
.../model/domain/GqlvPropertyAutoComplete.java | 15 ++----
.../graphql/model/domain/GqlvPropertyChoices.java | 7 ++-
.../graphql/model/domain/GqlvPropertyGet.java | 6 +--
.../graphql/model/domain/GqlvPropertySet.java | 12 ++---
.../graphql/model/domain/GqlvPropertyValidate.java | 8 +--
.../viewer/graphql/model/domain/TypeNames.java | 4 +-
.../model/exceptions/DisabledException.java | 2 -
.../graphql/model/exceptions/HiddenException.java | 1 -
.../model/exceptions/InteractionException.java | 1 -
.../graphql/model/exceptions/InvalidException.java | 2 -
.../graphql/model/fetcher/BookmarkedPojo.java | 7 ++-
.../model/fetcher/BookmarkedPojoFetcher.java | 5 +-
.../model/registry/GraphQLTypeRegistry.java | 13 +++--
.../viewer/graphql/model/types/TypeMapper.java | 13 +++--
.../graphql/model/types/TypeMapperDefault.java | 20 +++-----
...ayViewerGraphqlTestModuleIntegTestAbstract.java | 25 +++++-----
.../viewer/test/domain/UniversityModule.java | 5 --
.../viewer/test/domain/admin/AdminMenu.java | 15 +++---
.../viewer/test/domain/calc/Calculator.java | 5 +-
.../viewer/test/domain/calc/Month_Test.java | 3 +-
.../viewer/test/domain/dept/Department.java | 14 +++---
.../graphql/viewer/test/domain/dept/DeptHead.java | 4 +-
.../graphql/viewer/test/domain/dept/Grade.java | 26 ----------
.../viewer/test/domain/dept/StaffMember.java | 19 ++++++--
.../test/domain/dept/StaffMemberRepository.java | 3 +-
.../viewer/test/e2e/Abstract_IntegTest.java | 12 ++---
.../graphql/viewer/test/e2e/Admin_IntegTest.java | 3 --
.../viewer/test/e2e/Calculator_IntegTest.java | 4 --
.../viewer/test/e2e/DeptHead_IntegTest.java | 5 +-
.../graphql/viewer/test/e2e/Staff_IntegTest.java | 6 +--
.../test/schema/GqlSchema_print_IntegTest.java | 9 +---
.../viewer/test/schema/Schema_IntegTest.java | 13 +----
.../viewer/test/utils/WinMergeGqlDiffReporter.java | 4 +-
.../CausewayModuleIncViewerGraphqlViewer.java | 7 ---
.../graphql/viewer/auth/UserMementoProvider.java | 6 +--
...xecutionStrategyResolvingWithinInteraction.java | 13 ++---
.../integration/GraphQlSourceForCauseway.java | 27 ++++------
.../graphql/viewer/toplevel/GqlvTopLevelQuery.java | 15 +++---
60 files changed, 283 insertions(+), 429 deletions(-)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java
index 733b32a0ca..cd64fab639 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java
@@ -18,12 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.model.context;
-import graphql.schema.GraphQLCodeRegistry;
-
-import lombok.RequiredArgsConstructor;
-
-import java.util.EnumSet;
-
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.core.config.CausewayConfiguration;
@@ -32,8 +26,8 @@ import org.apache.causeway.core.metamodel.spec.ActionScope;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
+import graphql.schema.GraphQLCodeRegistry;
+import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class Context {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
index 3cf5a7612e..831f49c0c6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
@@ -18,6 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
@@ -31,22 +39,13 @@ import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.*;
-
-import lombok.extern.log4j.Log4j2;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
import lombok.val;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvAction
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java
index e1356732a0..72c3dfdc1c 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java
@@ -18,36 +18,33 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
+import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+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.viewer.graphql.model.context.Context;
-
import org.apache.causeway.viewer.graphql.model.exceptions.DisabledException;
import org.apache.causeway.viewer.graphql.model.exceptions.HiddenException;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
-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.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLList;
import graphql.schema.GraphQLOutputType;
import graphql.schema.GraphQLType;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvActionInvoke {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java
index c05f8b891a..6fe702d00a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -31,18 +34,12 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
import graphql.schema.DataFetchingEnvironment;
-
-import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
-
+import lombok.Getter;
import lombok.val;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvActionParam
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java
index 1279b1bf90..7f3cce130a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java
@@ -18,37 +18,34 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
- import java.util.Collections;
- import java.util.List;
- import java.util.stream.Collectors;
-
- import org.apache.causeway.applib.annotation.Where;
- import org.apache.causeway.applib.services.bookmark.BookmarkService;
- import org.apache.causeway.commons.collections.Can;
- import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
- import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
- import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
- import org.apache.causeway.core.metamodel.object.ManagedObject;
- import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
- import org.apache.causeway.viewer.graphql.model.context.Context;
- import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
- import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider;
- import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider;
- import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
- import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-
- import static graphql.schema.GraphQLNonNull.nonNull;
-
- import graphql.schema.GraphQLArgument;
-
- import lombok.val;
- import lombok.extern.log4j.Log4j2;
-
- import graphql.schema.DataFetchingEnvironment;
- import graphql.schema.GraphQLFieldDefinition;
- import graphql.schema.GraphQLList;
-
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLNonNull.nonNull;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
+import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.graphql.model.context.Context;
+import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
+import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
+
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLList;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvActionParamAutoComplete {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java
index 2fec45c1ee..91ceef52e5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java
@@ -18,6 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
@@ -33,20 +39,12 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLList;
-
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
@Log4j2
public class GqlvActionParamChoices {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java
index 8a7405bc1d..38809dd962 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java
@@ -18,30 +18,29 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
- import java.util.Collections;
-
- import org.apache.causeway.applib.annotation.Where;
- import org.apache.causeway.applib.services.bookmark.BookmarkService;
- import org.apache.causeway.commons.collections.Can;
- import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
- import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
- import org.apache.causeway.core.metamodel.object.ManagedObject;
- import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
- import org.apache.causeway.viewer.graphql.model.context.Context;
- import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
- import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider;
- import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider;
- import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
- import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-
- import lombok.val;
- import lombok.extern.log4j.Log4j2;
-
- import graphql.schema.DataFetchingEnvironment;
- import graphql.schema.GraphQLFieldDefinition;
-
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import java.util.Collections;
+
+import org.apache.causeway.applib.annotation.Where;
+import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
+import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
+import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.graphql.model.context.Context;
+import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
+import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
+
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
@Log4j2
public class GqlvActionParamDefault {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java
index 9c5bdfe88a..df8e070241 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -30,13 +32,10 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java
index 345f7a4a13..d0638e4d2f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -30,13 +32,10 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvActionParamHidden {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java
index 5798572484..5a0e23397b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
@@ -30,13 +32,10 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvActionParamValidate {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java
index a96f6ace58..0496a1b4d9 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java
@@ -18,6 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -31,22 +38,12 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
import graphql.schema.DataFetchingEnvironment;
-
-import lombok.Getter;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
-
+import lombok.Getter;
import lombok.val;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvActionParams implements GqlvActionParam.Holder {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionValidity.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionValidity.java
index 64b58dc73e..d916d92bde 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionValidity.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionValidity.java
@@ -18,11 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
-import java.util.Map;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import org.apache.causeway.core.metamodel.consent.Consent;
+import java.util.Map;
import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -33,14 +34,11 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLOutputType;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvActionValidity {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java
index c8ab87860a..31164628ea 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
@@ -25,13 +27,10 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import lombok.val;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLOutputType;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
public abstract class GqlvAssociationGet<T extends ObjectAssociation> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
index 1d68513da1..8037b30814 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
@@ -27,9 +30,6 @@ import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
-
public class GqlvCollection
extends GqlvAssociation<OneToManyAssociation, GqlvCollection.Holder>
implements GqlvCollectionGet.Holder,
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java
index d342ede8eb..80b9512bd2 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java
@@ -20,13 +20,9 @@ package org.apache.causeway.viewer.graphql.model.domain;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-
-import lombok.val;
import graphql.schema.GraphQLOutputType;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
public class GqlvCollectionGet extends GqlvAssociationGet<OneToManyAssociation> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 1498b8a62e..3a890415f8 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -18,6 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
+import static graphql.schema.GraphQLInputObjectType.newInputObject;
+import static graphql.schema.GraphQLNonNull.nonNull;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -25,22 +30,18 @@ import java.util.TreeMap;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.core.metamodel.spec.ActionScope;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-import org.apache.causeway.core.metamodel.spec.feature.*;
+import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
+import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
-import lombok.Getter;
-
import graphql.Scalars;
import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLInputObjectType;
import graphql.schema.GraphQLObjectType;
-
-import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
-import static graphql.schema.GraphQLInputObjectType.newInputObject;
-import static graphql.schema.GraphQLNonNull.nonNull;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.Getter;
/**
* Exposes a domain object (view model or entity) via the GQL viewer.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index fe81854d56..1ff2fe88db 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -18,25 +18,22 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.FieldCoordinates.coordinates;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.causeway.core.metamodel.spec.ActionScope;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
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.context.Context;
-import lombok.Getter;
-
import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
-
-import static graphql.schema.FieldCoordinates.coordinates;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.Getter;
/**
* Exposes a domain service (view model or entity) via the GQL viewer.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
index f0aa6af264..7416f6dfe9 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
@@ -22,11 +22,9 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
+import graphql.schema.GraphQLFieldDefinition;
import lombok.AccessLevel;
import lombok.Getter;
-
-import graphql.schema.GraphQLFieldDefinition;
-
import lombok.Setter;
public abstract class GqlvMember<T extends ObjectMember, H extends GqlvMember.Holder> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberDisabled.java
index d5d30ce9b0..6bfbf97e14 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberDisabled.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberDisabled.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -27,13 +29,10 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvMemberDisabled<T extends ObjectMember> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHidden.java
index ff391a45f5..4a965ed5a3 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHidden.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHidden.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -27,13 +29,10 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
@Log4j2
public class GqlvMemberHidden<T extends ObjectMember> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java
index 1b6f85cac1..55ba9296f1 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java
@@ -18,6 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.FieldCoordinates.coordinates;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLNonNull.nonNull;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import java.util.Objects;
import java.util.Optional;
@@ -30,18 +35,12 @@ import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
-import lombok.Getter;
-import lombok.val;
-
import graphql.Scalars;
import graphql.schema.DataFetcher;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
-
-import static graphql.schema.FieldCoordinates.coordinates;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLNonNull.nonNull;
-import static graphql.schema.GraphQLObjectType.newObject;
+import lombok.Getter;
+import lombok.val;
public class GqlvMeta {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
index f1e79a8983..44dec88f3a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
@@ -18,19 +18,21 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import graphql.schema.*;
-
+import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
import lombok.val;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
-
public class GqlvProperty
extends GqlvAssociation<OneToOneAssociation, GqlvProperty.Holder>
implements GqlvMemberHidden.Holder<OneToOneAssociation>,
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java
index 79e48b6621..8d25c2978f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLNonNull.nonNull;
+
import java.util.List;
import java.util.stream.Collectors;
@@ -27,21 +30,13 @@ import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-
-import static graphql.schema.GraphQLNonNull.nonNull;
+import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLArgument;
-
+import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLList;
-
import lombok.val;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
public class GqlvPropertyAutoComplete {
private static final String SEARCH_PARAM_NAME = "search";
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java
index 49320cf76c..9989054d7d 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
import java.util.List;
import java.util.stream.Collectors;
@@ -30,13 +32,10 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP
import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLList;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
public class GqlvPropertyChoices {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java
index 820df38fcf..f76179ac83 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java
@@ -20,13 +20,9 @@ package org.apache.causeway.viewer.graphql.model.domain;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-
-import lombok.val;
import graphql.schema.GraphQLOutputType;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
public class GqlvPropertyGet extends GqlvAssociationGet<OneToOneAssociation> {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java
index ef7854e6d9..ac2796d3e6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertySet.java
@@ -18,8 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
+import java.util.Map;
+
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
@@ -32,15 +35,10 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP
import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLOutputType;
-
-import java.util.Map;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
public class GqlvPropertySet {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java
index a75ceccde3..d9fad697e0 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java
@@ -18,9 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
-import java.util.Map;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
@@ -30,12 +29,9 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP
import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import lombok.val;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
-
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import lombok.val;
public class GqlvPropertyValidate {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/TypeNames.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/TypeNames.java
index 6de2a022be..c824bd5a7c 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/TypeNames.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/TypeNames.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
-import lombok.experimental.UtilityClass;
-
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.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+import lombok.experimental.UtilityClass;
+
@UtilityClass
public final class TypeNames {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/DisabledException.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/DisabledException.java
index dd5919ee09..dbcf780d79 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/DisabledException.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/DisabledException.java
@@ -19,8 +19,6 @@
package org.apache.causeway.viewer.graphql.model.exceptions;
import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.exceptions.RecoverableException;
-import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.core.metamodel.consent.Consent;
public class DisabledException extends InteractionException {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/HiddenException.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/HiddenException.java
index 36dbf1ca31..78523eec95 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/HiddenException.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/HiddenException.java
@@ -20,7 +20,6 @@ package org.apache.causeway.viewer.graphql.model.exceptions;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.core.metamodel.consent.Consent;
-import org.apache.causeway.core.metamodel.spec.feature.OneToOneFeature;
public class HiddenException extends InteractionException {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InteractionException.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InteractionException.java
index fcbb93fb0e..4d27d3e4da 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InteractionException.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InteractionException.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.graphql.model.exceptions;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.exceptions.RecoverableException;
import org.apache.causeway.applib.services.i18n.TranslatableString;
-import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
public abstract class InteractionException extends RecoverableException {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InvalidException.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InvalidException.java
index 5878dedfa7..d6fff41265 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InvalidException.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/exceptions/InvalidException.java
@@ -19,8 +19,6 @@
package org.apache.causeway.viewer.graphql.model.exceptions;
import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.exceptions.RecoverableException;
-import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.core.metamodel.consent.Consent;
public class InvalidException extends InteractionException {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java
index 09aa8a62ce..8394cf3041 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java
@@ -18,13 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.fetcher;
-import graphql.schema.DataFetchingEnvironment;
-
-import lombok.val;
-
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import graphql.schema.DataFetchingEnvironment;
+import lombok.val;
+
public class BookmarkedPojo {
private final Bookmark bookmark;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java
index 7a70a9109d..479a12aad5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java
@@ -18,13 +18,12 @@
*/
package org.apache.causeway.viewer.graphql.model.fetcher;
+import org.apache.causeway.applib.services.bookmark.BookmarkService;
+
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
-
import lombok.val;
-import org.apache.causeway.applib.services.bookmark.BookmarkService;
-
public class BookmarkedPojoFetcher implements DataFetcher<Object> {
private final BookmarkService bookmarkService;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
index 9442e40b70..e431de3250 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/registry/GraphQLTypeRegistry.java
@@ -18,19 +18,18 @@
*/
package org.apache.causeway.viewer.graphql.model.registry;
-import graphql.schema.GraphQLInputObjectType;
-import graphql.schema.GraphQLNamedType;
-import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLType;
-
-import lombok.extern.log4j.Log4j2;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.springframework.stereotype.Component;
+import graphql.schema.GraphQLInputObjectType;
+import graphql.schema.GraphQLNamedType;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLType;
+import lombok.extern.log4j.Log4j2;
+
/**
* Just a simple wrapper around the set of discovered {@link GraphQLType}s.
*/
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
index cd702bfc46..62740bd76e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
@@ -18,7 +18,10 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
-import graphql.schema.*;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.Nullable;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -26,10 +29,10 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToManyActionParameter;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneFeature;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.lang.Nullable;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLScalarType;
public interface TypeMapper {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java
index f521f2ff88..c51ffa979b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapperDefault.java
@@ -18,6 +18,9 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
+import static graphql.schema.GraphQLNonNull.nonNull;
+import static graphql.schema.GraphQLTypeReference.typeRef;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
@@ -25,39 +28,28 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Map;
-import javax.annotation.Priority;
import javax.inject.Inject;
import javax.ws.rs.NotSupportedException;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.joda.time.DateTime;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Component;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.commons.internal.collections._Maps;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyActionParameter;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneFeature;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
import graphql.Scalars;
import graphql.schema.GraphQLInputType;
import graphql.schema.GraphQLList;
import graphql.schema.GraphQLOutputType;
import graphql.schema.GraphQLScalarType;
import graphql.schema.GraphQLTypeReference;
-
-import static graphql.schema.GraphQLNonNull.nonNull;
-import static graphql.schema.GraphQLTypeReference.typeRef;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class TypeMapperDefault implements TypeMapper {
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
index 7e40dae0ae..6b29ac318e 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
@@ -18,9 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test;
-import lombok.Value;
-import lombok.val;
-
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URI;
@@ -33,13 +30,8 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.commons.internal.resources._Resources;
-
-import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
-import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import org.apache.causeway.viewer.graphql.viewer.integration.ExecutionGraphQlServiceForCauseway;
-import org.apache.causeway.viewer.graphql.viewer.integration.GraphQlSourceForCauseway;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.approvaltests.core.Options;
import org.junit.jupiter.api.BeforeEach;
@@ -47,7 +39,6 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
-
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureHttpGraphQlTester;
@@ -61,19 +52,25 @@ import org.springframework.graphql.test.tester.HttpGraphQlTester;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.web.reactive.server.WebTestClient;
+import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.resources._Resources;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import org.apache.causeway.viewer.graphql.viewer.CausewayModuleIncViewerGraphqlViewer;
+import org.apache.causeway.viewer.graphql.viewer.integration.ExecutionGraphQlServiceForCauseway;
+import org.apache.causeway.viewer.graphql.viewer.integration.GraphQlSourceForCauseway;
import org.apache.causeway.viewer.graphql.viewer.test.domain.UniversityModule;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
+import lombok.Value;
+import lombok.val;
+
@SpringBootTest(
classes = {
CausewayViewerGraphqlTestModuleIntegTestAbstract.TestApp.class
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
index 00bce680f7..1d163cd829 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
@@ -18,16 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.domain;
-import javax.inject.Inject;
-
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-
@Configuration
@ComponentScan
@EnableJpaRepositories
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java
index de521f4fa0..2a160258a0 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/admin/AdminMenu.java
@@ -18,19 +18,20 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.domain.admin;
-import lombok.RequiredArgsConstructor;
-
-import java.util.List;
-
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.causeway.applib.annotation.*;
-
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.applib.annotation.DomainService;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.commons.internal.base._Strings;
-import org.springframework.lang.Nullable;
+import lombok.RequiredArgsConstructor;
@Named("university.admin.AdminMenu")
@DomainService(nature=NatureOfService.VIEW)
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Calculator.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Calculator.java
index 471a3254c0..64ad99c6e2 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Calculator.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Calculator.java
@@ -1,11 +1,8 @@
package org.apache.causeway.viewer.graphql.viewer.test.domain.calc;
-import lombok.RequiredArgsConstructor;
-
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
-import java.util.List;
import javax.annotation.Priority;
import javax.inject.Inject;
@@ -19,6 +16,8 @@ import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
+import lombok.RequiredArgsConstructor;
+
@Named("university.calc.Calculator")
@DomainService(nature= NatureOfService.VIEW)
@Priority(PriorityPrecedence.EARLY)
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Month_Test.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Month_Test.java
index 38982a992b..f87fbf5d1d 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Month_Test.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/Month_Test.java
@@ -1,8 +1,7 @@
package org.apache.causeway.viewer.graphql.viewer.test.domain.calc;
-import static org.junit.jupiter.api.Assertions.*;
-
import org.junit.jupiter.api.Test;
+
import static org.assertj.core.api.Assertions.assertThat;
public class Month_Test {
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Department.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Department.java
index 47ae74c81d..62593d6ec3 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Department.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Department.java
@@ -18,6 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.domain.dept;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
import javax.inject.Inject;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -44,13 +51,6 @@ import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.val;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
@Entity
@Table(
schema = "public",
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/DeptHead.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/DeptHead.java
index 504e0455ad..5d7b602736 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/DeptHead.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/DeptHead.java
@@ -38,12 +38,12 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.SemanticsOf;
+import static org.apache.causeway.applib.annotation.Editing.ENABLED;
+
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import static org.apache.causeway.applib.annotation.Editing.ENABLED;
-
@Entity
@Table(
schema = "public",
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java
index c414e440f3..484ff0940c 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Grade.java
@@ -18,32 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.domain.dept;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.SemanticsOf;
-
-import static org.apache.causeway.applib.annotation.Editing.ENABLED;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
public enum Grade {
PROFESSOR,
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMember.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMember.java
index 3a7aad7593..0298469d8e 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMember.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMember.java
@@ -18,13 +18,18 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.domain.dept;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
import java.util.Comparator;
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
@@ -35,6 +40,10 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
@Entity
@Table(
schema = "public",
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMemberRepository.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMemberRepository.java
index 0724d37472..f334020365 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMemberRepository.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/StaffMemberRepository.java
@@ -23,11 +23,10 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.applib.value.Blob;
-
import org.springframework.stereotype.Repository;
import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.applib.value.Blob;
@Repository
public class StaffMemberRepository {
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
index 2a11f5a30d..0971bed8a9 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java
@@ -18,31 +18,27 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.e2e;
-import lombok.SneakyThrows;
-import lombok.val;
-
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.inject.Inject;
-import org.apache.causeway.applib.value.Blob;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
import org.springframework.core.io.ClassPathResource;
import org.springframework.transaction.annotation.Propagation;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.Department;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DepartmentRepository;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DeptHeadRepository;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.StaffMemberRepository;
+import lombok.SneakyThrows;
+import lombok.val;
+
public abstract class Abstract_IntegTest extends CausewayViewerGraphqlTestModuleIntegTestAbstract {
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java
index 4262403834..833b5f1b1d 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java
@@ -22,9 +22,6 @@ import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
import org.springframework.test.context.ActiveProfiles;
import lombok.val;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java
index b39ba8781e..e5d18f81d5 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java
@@ -21,11 +21,7 @@ package org.apache.causeway.viewer.graphql.viewer.test.e2e;
import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
import org.springframework.test.context.ActiveProfiles;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java
index 4b9019d10c..63264d1e24 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java
@@ -22,12 +22,11 @@ import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DeptHead;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java
index fd53eb0bf3..ff57d67c18 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java
@@ -24,12 +24,12 @@ import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.Department;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java
index 561a7b6900..05f85f69f1 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java
@@ -25,25 +25,20 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
-import org.apache.causeway.commons.io.TextUtils;
-
-import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract;
-
import org.approvaltests.core.Options;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.transaction.annotation.Transactional;
+import org.apache.causeway.commons.io.TextUtils;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.viewer.graphql.viewer.integration.GraphQlSourceForCauseway;
+import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
import graphql.schema.idl.SchemaPrinter;
-
import lombok.val;
@Transactional
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java
index b3efa11078..899059f676 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java
@@ -18,25 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.schema;
-import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract;
-
import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-
-import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
-
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-
import org.springframework.test.context.ActiveProfiles;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
-import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
-
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract;
@ActiveProfiles("test")
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/utils/WinMergeGqlDiffReporter.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/utils/WinMergeGqlDiffReporter.java
index 732fa8d119..999ddfc7f7 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/utils/WinMergeGqlDiffReporter.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/utils/WinMergeGqlDiffReporter.java
@@ -2,12 +2,12 @@ package org.apache.causeway.viewer.graphql.viewer.test.utils;
import java.util.List;
+import com.spun.util.ArrayUtils;
+
import org.approvaltests.reporters.DiffInfo;
import org.approvaltests.reporters.DiffPrograms;
import org.approvaltests.reporters.GenericDiffReporter;
-import com.spun.util.ArrayUtils;
-
public class WinMergeGqlDiffReporter extends GenericDiffReporter {
private static DiffInfo WIN_MERGE_REPORTER =
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java
index 9703764508..e144d17fd0 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleIncViewerGraphqlViewer.java
@@ -18,13 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer;
-import graphql.ExceptionWhileDataFetching;
-import graphql.GraphQLError;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
import org.springframework.boot.autoconfigure.graphql.GraphQlCorsProperties;
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProvider.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProvider.java
index e54ff131f0..947fa0fde3 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProvider.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProvider.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.viewer.auth;
-import org.apache.causeway.applib.services.user.UserMemento;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.core.config.CausewayConfiguration;
+
public interface UserMementoProvider {
UserMemento userMemento();
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
index 882fd1b610..e74619487f 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
@@ -20,25 +20,18 @@ package org.apache.causeway.viewer.graphql.viewer.integration;
import java.util.concurrent.CompletableFuture;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.user.RoleMemento;
-import org.apache.causeway.applib.services.user.UserMemento;
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
-import org.apache.causeway.viewer.graphql.viewer.auth.UserMementoProvider;
-
import org.springframework.stereotype.Service;
+import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.user.UserMemento;
+import org.apache.causeway.viewer.graphql.viewer.auth.UserMementoProvider;
import graphql.execution.AsyncExecutionStrategy;
import graphql.execution.ExecutionContext;
import graphql.execution.ExecutionStrategyParameters;
import graphql.execution.FieldValueInfo;
-import lombok.val;
-
@Service
public class AsyncExecutionStrategyResolvingWithinInteraction extends AsyncExecutionStrategy {
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index 2ff2c42cde..72a2b40e30 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -18,10 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer.integration;
-import static graphql.schema.FieldCoordinates.coordinates;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
-
import java.util.Comparator;
import java.util.List;
import java.util.Set;
@@ -29,27 +25,24 @@ import java.util.Set;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.applib.id.HasLogicalType;
+import org.springframework.graphql.execution.GraphQlSource;
+import org.springframework.stereotype.Service;
+import org.apache.causeway.applib.id.HasLogicalType;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
+import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainObject;
import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainService;
+import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
import org.apache.causeway.viewer.graphql.viewer.toplevel.GqlvTopLevelQuery;
-import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
-
-import org.springframework.graphql.execution.GraphQlSource;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
-import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
-import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import graphql.GraphQL;
import graphql.execution.DataFetcherExceptionHandler;
@@ -57,9 +50,7 @@ import graphql.execution.DataFetcherExceptionHandlerParameters;
import graphql.execution.DataFetcherExceptionHandlerResult;
import graphql.schema.GraphQLCodeRegistry;
import graphql.schema.GraphQLSchema;
-
import graphql.schema.GraphQLType;
-
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java
index e73aea8e4a..d382950a08 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java
@@ -1,21 +1,20 @@
package org.apache.causeway.viewer.graphql.viewer.toplevel;
+import static graphql.schema.FieldCoordinates.coordinates;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
+import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainService;
+
import graphql.Scalars;
import graphql.schema.DataFetcher;
import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLCodeRegistry;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
-
import lombok.Getter;
-import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainService;
-
-import static graphql.schema.FieldCoordinates.coordinates;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
-
public class GqlvTopLevelQuery {
private final ServiceRegistry serviceRegistry;