You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/02/15 08:21:22 UTC
(causeway) branch CAUSEWAY-3676 updated (4f83e1478e -> f3cd97b0da)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 4f83e1478e CAUSEWAY-3676: scrubs bookmarks for repeatability; removes the ugly 'gqlv_' part of the default prefixes
new bd77ee5bb7 CAUSEWAY-3676: use addChildFieldFor where possible; removes 'grid' from test; adds clob controller
new f3cd97b0da CAUSEWAY-3676: reorg imports is all
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../viewer/graphql/model/context/Context.java | 14 ++---
.../viewer/graphql/model/domain/GqlvAbstract.java | 5 +-
.../graphql/model/domain/GqlvAbstractCustom.java | 18 +++---
.../viewer/graphql/model/domain/GqlvAction.java | 41 +++++++------
.../graphql/model/domain/GqlvActionInvoke.java | 2 +-
.../graphql/model/domain/GqlvActionParam.java | 42 +++----------
.../model/domain/GqlvActionParamAutoComplete.java | 2 +-
.../model/domain/GqlvActionParamChoices.java | 2 +-
.../model/domain/GqlvActionParamDisabled.java | 4 +-
.../model/domain/GqlvActionParamHidden.java | 4 +-
.../model/domain/GqlvActionParamValidate.java | 4 +-
.../graphql/model/domain/GqlvActionParams.java | 9 +--
.../graphql/model/domain/GqlvActionValidity.java | 2 +-
.../model/domain/GqlvAssociationDatatype.java | 5 +-
.../graphql/model/domain/GqlvCollection.java | 15 ++---
.../graphql/model/domain/GqlvDomainObject.java | 25 ++++----
.../graphql/model/domain/GqlvDomainService.java | 6 +-
.../viewer/graphql/model/domain/GqlvMember.java | 4 +-
.../graphql/model/domain/GqlvMemberDisabled.java | 2 +-
.../graphql/model/domain/GqlvMemberHidden.java | 2 +-
.../viewer/graphql/model/domain/GqlvMeta.java | 48 +++++----------
.../graphql/model/domain/GqlvMetaCssClass.java | 6 +-
.../viewer/graphql/model/domain/GqlvMetaGrid.java | 6 +-
.../graphql/model/domain/GqlvMetaIconName.java | 6 +-
.../viewer/graphql/model/domain/GqlvMetaId.java | 6 +-
.../graphql/model/domain/GqlvMetaLayout.java | 6 +-
.../graphql/model/domain/GqlvMetaSaveAs.java | 4 +-
.../graphql/model/domain/GqlvMetaVersion.java | 6 +-
.../viewer/graphql/model/domain/GqlvProperty.java | 71 ++++++++++------------
.../model/domain/GqlvPropertyGetBlobAbstract.java | 3 +-
.../model/domain/GqlvPropertyGetBlobBytes.java | 8 +--
...opertyGetBlob.java => GqlvPropertyGetClob.java} | 24 ++++----
...tract.java => GqlvPropertyGetClobAbstract.java} | 7 +--
...lobBytes.java => GqlvPropertyGetClobChars.java} | 14 ++---
...eType.java => GqlvPropertyGetClobMimeType.java} | 4 +-
...tBlobName.java => GqlvPropertyGetClobName.java} | 4 +-
.../graphql/model/domain/GqlvPropertySet.java | 9 +--
.../graphql/model/domain/GqlvPropertyValidate.java | 4 +-
.../viewer/graphql/model/domain/GqlvScenario.java | 11 ++--
.../graphql/model/domain/GqlvScenarioName.java | 5 +-
.../graphql/model/domain/GqlvScenarioStep.java | 10 +--
.../marshallers/ScalarMarshallerBigDecimal.java | 10 ++-
.../marshallers/ScalarMarshallerBigInteger.java | 10 ++-
.../ScalarMarshallerBooleanPrimitive.java | 10 ++-
.../ScalarMarshallerBooleanWrapper.java | 10 ++-
.../marshallers/ScalarMarshallerBytePrimitive.java | 3 +-
.../marshallers/ScalarMarshallerByteWrapper.java | 9 ++-
.../marshallers/ScalarMarshallerCharPrimitive.java | 9 ++-
.../ScalarMarshallerCharacterWrapper.java | 3 +-
.../ScalarMarshallerDoublePrimitive.java | 10 ++-
.../marshallers/ScalarMarshallerDoubleWrapper.java | 10 ++-
.../ScalarMarshallerFloatPrimitive.java | 10 ++-
.../marshallers/ScalarMarshallerFloatWrapper.java | 6 +-
.../marshallers/ScalarMarshallerIntPrimitive.java | 10 ++-
.../ScalarMarshallerIntegerWrapper.java | 10 ++-
.../marshallers/ScalarMarshallerJdk8LocalDate.java | 10 ++-
.../ScalarMarshallerJdk8ZonedDateTime.java | 9 ++-
.../marshallers/ScalarMarshallerJodaDateTime.java | 11 ++--
.../marshallers/ScalarMarshallerJodaLocalDate.java | 12 ++--
.../marshallers/ScalarMarshallerLongPrimitive.java | 10 ++-
.../marshallers/ScalarMarshallerLongWrapper.java | 10 ++-
.../model/marshallers/ScalarMarshallerObject.java | 4 +-
.../ScalarMarshallerShortPrimitive.java | 10 ++-
.../marshallers/ScalarMarshallerShortWrapper.java | 10 ++-
.../model/marshallers/ScalarMarshallerString.java | 10 ++-
.../marshallers/ScalarMarshallerVoidPrimitive.java | 9 ++-
.../marshallers/ScalarMarshallerVoidWrapper.java | 3 +-
.../model/registry/GraphQLTypeRegistry.java | 18 +++---
.../model/toplevel/GqlvTopLevelMutation.java | 9 +--
.../graphql/model/toplevel/GqlvTopLevelQuery.java | 13 ++--
.../viewer/graphql/model/types/ScalarMapper.java | 2 +-
.../types/ScalarMapperUsingScalarMarshallers.java | 10 +--
.../viewer/graphql/model/types/TypeMapper.java | 8 +--
.../graphql/model/types/TypeMapperDefault.java | 17 +++---
.../e2e/queryandmutations/Admin_IntegTest.java | 1 +
.../queryandmutations/Calculator_IntegTest.java | 1 +
.../DepartmentMutating_IntegTest.java | 1 +
.../queryandmutations/Department_IntegTest.java | 10 +--
.../DeptHeadMutating_IntegTest.java | 1 +
.../e2e/queryandmutations/DeptHead_IntegTest.java | 3 +-
.../queryandmutations/StaffMutating_IntegTest.java | 1 +
...gTest.create_staff_member_with_department._.gql | 1 -
...eate_staff_member_with_department.approved.json | 3 +-
.../e2e/queryandmutations/Staff_IntegTest.java | 11 ++--
.../test/e2e/scenario/Calculator_IntegTest.java | 1 +
.../test/e2e/scenario/Department_IntegTest.java | 1 +
.../schema/GqlSchemaQuery_print_IntegTest.java | 1 +
.../viewer/CausewayModuleViewerGraphqlViewer.java | 5 +-
.../viewer/auth/UserMementoProviderDefault.java | 6 +-
...ytesController.java => ResourceController.java} | 48 +++++++++++----
...xecutionStrategyResolvingWithinInteraction.java | 10 +--
.../integration/GraphQlSourceForCauseway.java | 7 ++-
92 files changed, 410 insertions(+), 477 deletions(-)
copy viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/{GqlvPropertyGetBlob.java => GqlvPropertyGetClob.java} (81%)
copy viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/{GqlvPropertyGetBlobAbstract.java => GqlvPropertyGetClobAbstract.java} (96%)
copy viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/{GqlvPropertyGetBlobBytes.java => GqlvPropertyGetClobChars.java} (91%)
copy viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/{GqlvPropertyGetBlobMimeType.java => GqlvPropertyGetClobMimeType.java} (91%)
copy viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/{GqlvPropertyGetBlobName.java => GqlvPropertyGetClobName.java} (92%)
rename viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/{BlobBytesController.java => ResourceController.java} (71%)
(causeway) 01/02: CAUSEWAY-3676: use addChildFieldFor where possible; removes 'grid' from test; adds clob controller
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit bd77ee5bb7bca34b13f57dec4bf2065c209862d2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 15 07:12:03 2024 +0000
CAUSEWAY-3676: use addChildFieldFor where possible; removes 'grid' from test; adds clob controller
---
.../graphql/model/domain/GqlvAbstractCustom.java | 14 ++--
.../viewer/graphql/model/domain/GqlvAction.java | 33 ++++----
.../graphql/model/domain/GqlvActionParam.java | 41 ++--------
.../graphql/model/domain/GqlvActionParams.java | 4 +-
.../graphql/model/domain/GqlvCollection.java | 15 +---
.../graphql/model/domain/GqlvDomainObject.java | 25 +++---
.../graphql/model/domain/GqlvDomainService.java | 2 +-
.../viewer/graphql/model/domain/GqlvMeta.java | 45 ++++-------
.../viewer/graphql/model/domain/GqlvProperty.java | 71 ++++++++---------
.../graphql/model/domain/GqlvPropertyGetClob.java | 90 ++++++++++++++++++++++
.../model/domain/GqlvPropertyGetClobAbstract.java | 78 +++++++++++++++++++
.../model/domain/GqlvPropertyGetClobChars.java | 49 ++++++++++++
.../model/domain/GqlvPropertyGetClobMimeType.java | 39 ++++++++++
.../model/domain/GqlvPropertyGetClobName.java | 39 ++++++++++
.../viewer/graphql/model/domain/GqlvScenario.java | 3 +-
.../graphql/model/domain/GqlvScenarioStep.java | 10 ++-
.../model/toplevel/GqlvTopLevelMutation.java | 4 +-
.../graphql/model/toplevel/GqlvTopLevelQuery.java | 13 ++--
...gTest.create_staff_member_with_department._.gql | 1 -
...eate_staff_member_with_department.approved.json | 3 +-
.../viewer/CausewayModuleViewerGraphqlViewer.java | 4 +-
...ytesController.java => ResourceController.java} | 41 +++++++---
22 files changed, 447 insertions(+), 177 deletions(-)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
index 479b7cc62e..5d4e78a012 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
@@ -27,6 +27,8 @@ import static graphql.schema.GraphQLObjectType.newObject;
import org.apache.causeway.viewer.graphql.model.context.Context;
+import org.springframework.lang.Nullable;
+
import lombok.AccessLevel;
import lombok.Getter;
@@ -59,15 +61,17 @@ public abstract class GqlvAbstractCustom extends GqlvAbstract implements Parent
return gqlObjectType != null;
}
- protected final void addChildFieldFor(GqlvAbstract hasField) {
- addChildField(hasField.getField());
- }
-
- protected final void addChildField(GraphQLFieldDefinition childField) {
+ protected final void addChildFieldFor(@Nullable GqlvAbstract hasField) {
if (isBuilt()) {
+ throw new IllegalStateException("Object type has already been built");
+ }
+ if (hasField == null) {
return;
}
+ addChildField(hasField.getField());
+ }
+ void addChildField(GraphQLFieldDefinition childField) {
if (childField != null) {
gqlObjectTypeBuilder.field(childField);
}
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 fa8ef68e2c..7c46953a23 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
@@ -26,6 +26,7 @@ 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;
+import org.apache.causeway.core.config.CausewayConfiguration;
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;
@@ -76,23 +77,29 @@ public class GqlvAction
addChildFieldFor(this.disabled = new GqlvMemberDisabled<>(this, context));
addChildFieldFor(this.validate = new GqlvActionValidity(this, context));
- val variant = context.causewayConfiguration.getViewer().getGraphql().getApiVariant();
- if (objectAction.getSemantics().isSafeInNature() || variant == QUERY_WITH_MUTATIONS_NON_SPEC_COMPLIANT) {
- addChildFieldFor(this.invoke = new GqlvActionInvoke(this, context));
- } else {
- this.invoke = null;
- }
- val params = new GqlvActionParams(this, context);
- if (params.hasParams()) {
- this.params = params;
- addChildField(params.getField());
- } else {
- this.params = null;
- }
+ addChildFieldFor(
+ this.invoke = isInvokeAllowed(objectAction)
+ ? new GqlvActionInvoke(this, context)
+ : null);
+ addChildFieldFor(this.params = new GqlvActionParams(this, context));
buildObjectTypeAndField(objectAction.getId());
}
+ private boolean isInvokeAllowed(ObjectAction objectAction) {
+ val apiVariant = context.causewayConfiguration.getViewer().getGraphql().getApiVariant();
+ switch (apiVariant) {
+ case QUERY_ONLY:
+ case QUERY_AND_MUTATIONS:
+ return objectAction.getSemantics().isSafeInNature();
+ case QUERY_WITH_MUTATIONS_NON_SPEC_COMPLIANT:
+ return true;
+ default:
+ // shouldn't happen
+ throw new IllegalArgumentException("Unknown API variant: " + apiVariant);
+ }
+ }
+
public Can<ManagedObject> argumentManagedObjectsFor(
final DataFetchingEnvironment dataFetchingEnvironment,
final ObjectAction objectAction,
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 d9f6d096dc..6cf6e6df7a 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
@@ -79,40 +79,13 @@ public class GqlvActionParam
this.objectActionParameter = objectActionParameter;
this.paramNum = paramNum;
- this.hidden = new GqlvActionParamHidden(this, context);
- addChildField(hidden.getField());
- this.disabled = new GqlvActionParamDisabled(this, context);
- addChildField(disabled.getField());
-
- val choices = new GqlvActionParamChoices(this, context);
- addChildField(choices.getField());
- if (choices.isFieldDefined()) {
- this.choices = choices;
- } else {
- this.choices = null;
- }
-
- val autoComplete = new GqlvActionParamAutoComplete(this, context);
- addChildField(autoComplete.getField());
- if (autoComplete.isFieldDefined()) {
- this.autoComplete = autoComplete;
- } else {
- this.autoComplete = null;
- }
-
- val default_ = new GqlvActionParamDefault(this, context);
- addChildField(default_.getField());
- if (default_.isFieldDefined()) {
- this.default_ = default_;
- } else {
- this.default_ = null;
- }
-
- this.validate = new GqlvActionParamValidate(this, context);
- addChildField(validate.getField());
-
- this.datatype = new GqlvActionParamDatatype(this, context);
- addChildField(datatype.getField());
+ addChildFieldFor(this.hidden = new GqlvActionParamHidden(this, context));
+ addChildFieldFor(this.disabled = new GqlvActionParamDisabled(this, context));
+ addChildFieldFor(this.choices = new GqlvActionParamChoices(this, context));
+ addChildFieldFor(this.autoComplete = new GqlvActionParamAutoComplete(this, context));
+ addChildFieldFor(this.default_ = new GqlvActionParamDefault(this, context));
+ addChildFieldFor(this.validate = new GqlvActionParamValidate(this, context));
+ addChildFieldFor(this.datatype = new GqlvActionParamDatatype(this, context));
buildObjectTypeAndField(objectActionParameter.getId());
}
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 e043d61d1d..0eccf8d435 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
@@ -85,8 +85,8 @@ public class GqlvActionParams
}
void addParam(ObjectActionParameter objectActionParameter, int paramNum) {
- GqlvActionParam gqlvActionParam = new GqlvActionParam(this, objectActionParameter, context, paramNum);
- addChildField(gqlvActionParam.getField());
+ val gqlvActionParam = new GqlvActionParam(this, objectActionParameter, context, paramNum);
+ addChildFieldFor(gqlvActionParam);
params.put(objectActionParameter.getId(), gqlvActionParam);
}
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 4d3ab7a15c..c5b4ff6343 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
@@ -41,17 +41,10 @@ public class GqlvCollection
) {
super(holder, oneToManyAssociation, TypeNames.collectionTypeNameFor(holder.getObjectSpecification(), oneToManyAssociation), context);
- this.hidden = new GqlvMemberHidden<>(this, context);
- addChildField(hidden.getField());
-
- this.disabled = new GqlvMemberDisabled<>(this, context);
- addChildField(disabled.getField());
-
- this.get = new GqlvCollectionGet(this, context);
- addChildField(get.getField());
-
- this.datatype = new GqlvCollectionDatatype(this, context);
- addChildField(datatype.getField());
+ addChildFieldFor(this.hidden = new GqlvMemberHidden<>(this, context));
+ addChildFieldFor(this.disabled = new GqlvMemberDisabled<>(this, context));
+ addChildFieldFor(this.get = new GqlvCollectionGet(this, context));
+ addChildFieldFor(this.datatype = new GqlvCollectionDatatype(this, context));
buildObjectTypeAndField(oneToManyAssociation.getId());
}
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 e4f895fd26..71a88f83e6 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
@@ -74,11 +74,10 @@ public class GqlvDomainObject
this.objectSpecification = objectSpecification;
gqlObjectTypeBuilder.description(objectSpecification.getDescription());
- this.meta = new GqlvMeta(this, context);
- addChildField(meta.getField());
+ addChildFieldFor(this.meta = new GqlvMeta(this, context));
- GraphQLInputObjectType.Builder inputTypeBuilder = newInputObject().name(TypeNames.inputTypeNameFor(objectSpecification));
- inputTypeBuilder
+ val inputObjectTypeBuilder = newInputObject().name(TypeNames.inputTypeNameFor(objectSpecification));
+ inputObjectTypeBuilder
.field(newInputObjectField()
.name("id")
.type(Scalars.GraphQLID)
@@ -90,7 +89,7 @@ public class GqlvDomainObject
.build()
)
;
- gqlInputObjectType = inputTypeBuilder.build();
+ gqlInputObjectType = inputObjectTypeBuilder.build();
setField(buildFieldDefinition(gqlInputObjectType));
@@ -129,8 +128,8 @@ public class GqlvDomainObject
objectSpecification.streamActions(context.getActionScope(), MixedIn.INCLUDED)
.forEach(objectAction -> {
- GqlvAction gqlvAction = new GqlvAction(this, objectAction, context);
- addChildField(gqlvAction.getField());
+ val gqlvAction = new GqlvAction(this, objectAction, context);
+ addChildFieldFor(gqlvAction);
actions.put(objectAction.getId(), gqlvAction);
});
}
@@ -143,16 +142,16 @@ public class GqlvDomainObject
}
private void addProperty(final OneToOneAssociation otoa) {
- GqlvProperty gqlvProperty = new GqlvProperty(this, otoa, context);
- addChildField(gqlvProperty.getField());
+ val gqlvProperty = new GqlvProperty(this, otoa, context);
+ addChildFieldFor(gqlvProperty);
properties.put(otoa.getId(), gqlvProperty);
}
private void addCollection(OneToManyAssociation otom) {
- GqlvCollection collection = new GqlvCollection(this, otom, context);
- addChildField(collection.getField());
- if (collection.isFieldDefined()) {
- collections.put(otom.getId(), collection);
+ val gqlvCollection = new GqlvCollection(this, otom, context);
+ addChildFieldFor(gqlvCollection);
+ if (gqlvCollection.isFieldDefined()) {
+ collections.put(otom.getId(), gqlvCollection);
}
}
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 8ffe5a6c85..7a51948524 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
@@ -82,7 +82,7 @@ public class GqlvDomainService
private void addAction(final ObjectAction objectAction) {
val gqlvAction = new GqlvAction(this, objectAction, context);
- addChildField(gqlvAction.getField());
+ addChildFieldFor(gqlvAction);
actions.put(objectAction.getId(), gqlvAction);
}
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 15181e1c19..bd12ca4380 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
@@ -57,46 +57,29 @@ public class GqlvMeta extends GqlvAbstractCustom {
super(TypeNames.metaTypeNameFor(holder.getObjectSpecification()), context);
this.holder = holder;
- metaId = new GqlvMetaId(context);
- addChildField(metaId.getField());
-
- metaLogicalTypeName = new GqlvMetaLogicalTypeName(context);
- addChildField(metaLogicalTypeName.getField());
-
- if (holder.getObjectSpecification().getBeanSort() == BeanSort.ENTITY) {
- metaVersion = new GqlvMetaVersion(context);
- addChildField(metaVersion.getField());
- } else {
- metaVersion = null;
- }
-
- metaTitle = new GqlvMetaTitle(context);
- addChildField(metaTitle.getField());
-
- metaIconName = new GqlvMetaIconName(context);
- addChildField(metaIconName.getField());
-
- metaCssClass = new GqlvMetaCssClass(context);
- addChildField(metaCssClass.getField());
-
- metaLayout = new GqlvMetaLayout(context);
- addChildField(metaLayout.getField());
-
- metaGrid = new GqlvMetaGrid(context);
- addChildField(metaGrid.getField());
-
- metaSaveAs = new GqlvMetaSaveAs(context);
- addChildField(metaSaveAs.getField());
+ addChildFieldFor(this.metaId = new GqlvMetaId(context));
+ addChildFieldFor(this.metaLogicalTypeName = new GqlvMetaLogicalTypeName(context));
+ addChildFieldFor(this.metaVersion = isEntity() ? new GqlvMetaVersion(context) : null);
+ addChildFieldFor(this.metaTitle = new GqlvMetaTitle(context));
+ addChildFieldFor(this.metaIconName = new GqlvMetaIconName(context));
+ addChildFieldFor(this.metaCssClass = new GqlvMetaCssClass(context));
+ addChildFieldFor(this.metaLayout = new GqlvMetaLayout(context));
+ addChildFieldFor(this.metaGrid = new GqlvMetaGrid(context));
+ addChildFieldFor(this.metaSaveAs = new GqlvMetaSaveAs(context));
val fieldName = context.causewayConfiguration.getViewer().getGraphql().getMetaData().getFieldName();
buildObjectTypeAndField(fieldName);
}
+ private boolean isEntity() {
+ return holder.getObjectSpecification().getBeanSort() == BeanSort.ENTITY;
+ }
+
@Override
protected void addDataFetchersForChildren() {
metaId.addDataFetcher(this);
metaLogicalTypeName.addDataFetcher(this);
- if (holder.getObjectSpecification().getBeanSort() == BeanSort.ENTITY) {
+ if (isEntity()) {
metaVersion.addDataFetcher(this);
}
metaTitle.addDataFetcher(this);
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 7e82bd35fc..f6ffed52d3 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
@@ -25,6 +25,7 @@ import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.core.config.CausewayConfiguration;
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.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -41,7 +42,8 @@ public class GqlvProperty
GqlvPropertyValidate.Holder,
GqlvPropertySet.Holder,
GqlvAssociationDatatype.Holder<OneToOneAssociation>,
- GqlvPropertyGetBlob.Holder {
+ GqlvPropertyGetBlob.Holder,
+ GqlvPropertyGetClob.Holder {
private final GqlvMemberHidden<OneToOneAssociation> hidden;
private final GqlvMemberDisabled<OneToOneAssociation> disabled;
@@ -68,51 +70,42 @@ public class GqlvProperty
final Context context) {
super(holder, oneToOneAssociation, TypeNames.propertyTypeNameFor(holder.getObjectSpecification(), oneToOneAssociation), context);
- this.hidden = new GqlvMemberHidden<>(this, context);
- addChildField(hidden.getField());
+ addChildFieldFor(this.hidden = new GqlvMemberHidden<>(this, context));
+ addChildFieldFor(this.disabled = new GqlvMemberDisabled<>(this, context));
- this.disabled = new GqlvMemberDisabled<>(this, context);
- addChildField(disabled.getField());
+ this.get = isBlob() ? new GqlvPropertyGetBlob(this, context) : isClob() ? new GqlvPropertyGetClob(this, context) : new GqlvPropertyGet(this, context);
+ addChildFieldFor(
+ isBlob()
+ ? new GqlvPropertyGetBlob(this, context)
+ : isClob()
+ ? new GqlvPropertyGetClob(this, context)
+ : new GqlvPropertyGet(this, context)
+ );
- if (isBlob()) {
- this.get = new GqlvPropertyGetBlob(this, context);
- } else {
- this.get = new GqlvPropertyGet(this, context);
- }
- addChildField(get.getField());
-
- this.validate = new GqlvPropertyValidate(this, context);
- addChildField(this.validate.getField());
+ addChildFieldFor(this.validate = new GqlvPropertyValidate(this, context));
+ addChildFieldFor(this.choices = new GqlvPropertyChoices(this, context));
+ addChildFieldFor(this.autoComplete = new GqlvPropertyAutoComplete(this, context));
+ addChildFieldFor(this.set = isSetterAllowed() ? new GqlvPropertySet(this, context) : null);
+ addChildFieldFor(this.datatype = new GqlvPropertyDatatype(this, context));
- val choices = new GqlvPropertyChoices(this, context);
- if (choices.isFieldDefined()) {
- addChildField(choices.getField());
- this.choices = choices;
- } else {
- this.choices = null;
- }
-
- val autoComplete = new GqlvPropertyAutoComplete(this, context);
- if (autoComplete.isFieldDefined()) {
- addChildField(autoComplete.getField());
- this.autoComplete = autoComplete;
- } else {
- this.autoComplete = null;
- }
+ buildObjectTypeAndField(oneToOneAssociation.getId());
+ }
- val variant = context.causewayConfiguration.getViewer().getGraphql().getApiVariant();
- if (variant == CausewayConfiguration.Viewer.Graphql.ApiVariant.QUERY_WITH_MUTATIONS_NON_SPEC_COMPLIANT) {
- this.set = new GqlvPropertySet(this, context);
- addChildField(set.getField());
- } else {
- this.set = null;
+ private boolean isSetterAllowed() {
+ val apiVariant = context.causewayConfiguration.getViewer().getGraphql().getApiVariant();
+ switch (apiVariant) {
+ case QUERY_ONLY:
+ case QUERY_AND_MUTATIONS:
+ return false;
+ case QUERY_WITH_MUTATIONS_NON_SPEC_COMPLIANT:
+ return true;
+ default:
+ // shouldn't happen
+ throw new IllegalArgumentException("Unknown API variant: " + apiVariant);
}
+ }
- this.datatype = new GqlvPropertyDatatype(this, context);
- addChildField(datatype.getField());
- buildObjectTypeAndField(oneToOneAssociation.getId());
- }
private boolean isBlob() {
return getOneToOneAssociation().getElementType().getCorrespondingClass() == Blob.class;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClob.java
new file mode 100644
index 0000000000..1944815515
--- /dev/null
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClob.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.schema.DataFetchingEnvironment;
+
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
+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.BookmarkedPojo;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationProvider;
+import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
+
+public class GqlvPropertyGetClob
+ extends GqlvAbstractCustom
+ implements GqlvPropertyGetClobChars.Holder
+{
+
+ final Holder holder;
+ final GqlvPropertyGetClobChars clobChars;
+ final GqlvPropertyGetClobMimeType clobMimeType;
+ final GqlvPropertyGetClobName clobName;
+
+ public GqlvPropertyGetClob(
+ final Holder holder,
+ final Context context) {
+ super(TypeNames.propertyBlobTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember()), context);
+ this.holder = holder;
+
+ addChildFieldFor(clobChars = new GqlvPropertyGetClobChars(this, context));
+ addChildFieldFor(clobMimeType = new GqlvPropertyGetClobMimeType(this, context));
+ addChildFieldFor(clobName = new GqlvPropertyGetClobName(this, context));
+
+ setField(newFieldDefinition()
+ .name("get")
+ .type(buildObjectType())
+ .build());
+ }
+
+ @Override
+ protected Object fetchData(final DataFetchingEnvironment dataFetchingEnvironment) {
+ return BookmarkedPojo.sourceFrom(dataFetchingEnvironment, context);
+ }
+
+ @Override
+ protected void addDataFetchersForChildren() {
+ clobChars.addDataFetcher(this);
+ clobMimeType.addDataFetcher(this);
+ clobName.addDataFetcher(this);
+ }
+
+ @Override
+ public OneToOneAssociation getObjectAssociation() {
+ return holder.getObjectAssociation();
+ }
+
+ @Override
+ public OneToOneAssociation getObjectMember() {
+ return holder.getObjectMember();
+ }
+
+ @Override
+ public ObjectSpecification getObjectSpecification() {
+ return holder.getObjectSpecification();
+ }
+
+ public interface Holder
+ extends ObjectSpecificationProvider,
+ ObjectAssociationProvider<OneToOneAssociation> {
+
+ }
+}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobAbstract.java
new file mode 100644
index 0000000000..87107f919c
--- /dev/null
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobAbstract.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
+import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.viewer.graphql.model.context.Context;
+import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
+import org.apache.causeway.viewer.graphql.model.domain.GqlvPropertyGet;
+import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+
+import lombok.val;
+
+public abstract class GqlvPropertyGetClobAbstract extends GqlvAbstract {
+
+ final Holder holder;
+
+ public GqlvPropertyGetClobAbstract(
+ final Holder holder,
+ final Context context, String name) {
+ super(context);
+ this.holder = holder;
+
+ setField(GraphQLFieldDefinition.newFieldDefinition()
+ .name(name)
+ .type(Scalars.GraphQLString)
+ .build());
+ }
+
+ protected Object fetchDataFromBlob(DataFetchingEnvironment environment, Function<Blob, ?> mapper) {
+ val sourcePojo = BookmarkedPojo.sourceFrom(environment);
+
+ val sourcePojoClass = sourcePojo.getClass();
+ val objectSpecification = context.specificationLoader.loadSpecification(sourcePojoClass);
+ if (objectSpecification == null) {
+ // not expected
+ return null;
+ }
+
+ val association = holder.getObjectAssociation();
+ val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo);
+ val resultManagedObject = association.get(managedObject);
+
+ return Optional.ofNullable(resultManagedObject)
+ .map(ManagedObject::getPojo)
+ .filter(Blob.class::isInstance)
+ .map(Blob.class::cast)
+ .map(mapper)
+ .orElse(null);
+ }
+
+ public interface Holder extends GqlvPropertyGet.Holder {
+ }
+
+}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobChars.java
new file mode 100644
index 0000000000..fd59b02d32
--- /dev/null
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobChars.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import java.util.Optional;
+
+import graphql.schema.DataFetchingEnvironment;
+
+import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.viewer.graphql.model.context.Context;
+import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+
+import lombok.val;
+
+public class GqlvPropertyGetClobChars extends GqlvPropertyGetClobAbstract {
+
+ public GqlvPropertyGetClobChars(
+ final Holder holder,
+ final Context context) {
+ super(holder, context, "bytes");
+ }
+
+ @Override
+ protected Object fetchData(DataFetchingEnvironment environment) {
+ val sourcePojo = BookmarkedPojo.sourceFrom(environment);
+
+ Optional<Bookmark> bookmarkIfAny = context.bookmarkService.bookmarkFor(sourcePojo);
+ return bookmarkIfAny.map(x -> String.format(
+ "///%s/object/%s:%s/%s/clobChars", "graphql", x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectAssociation().getId())).orElse(null);
+
+ }
+
+}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobMimeType.java
new file mode 100644
index 0000000000..9f314203f3
--- /dev/null
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobMimeType.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.schema.DataFetchingEnvironment;
+
+import org.apache.causeway.viewer.graphql.model.context.Context;
+
+public class GqlvPropertyGetClobMimeType extends GqlvPropertyGetClobAbstract {
+
+ public GqlvPropertyGetClobMimeType(
+ final Holder holder,
+ final Context context) {
+ super(holder, context, "mimeType");
+
+ }
+
+ @Override
+ protected Object fetchData(DataFetchingEnvironment environment) {
+ return fetchDataFromBlob(environment, blob -> blob.getMimeType().toString());
+ }
+
+}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobName.java
new file mode 100644
index 0000000000..5ea781c578
--- /dev/null
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobName.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.schema.DataFetchingEnvironment;
+
+import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.viewer.graphql.model.context.Context;
+
+public class GqlvPropertyGetClobName extends GqlvPropertyGetClobAbstract {
+
+ public GqlvPropertyGetClobName(
+ final Holder holder,
+ final Context context) {
+ super(holder, context, "name");
+ }
+
+ @Override
+ protected Object fetchData(DataFetchingEnvironment environment) {
+ return fetchDataFromBlob(environment, Blob::getName);
+ }
+
+}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java
index ede625c72e..07e4f851bf 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java
@@ -41,8 +41,7 @@ public class GqlvScenario
final Context context) {
super("Scenario", context);
- this.scenarioName = new GqlvScenarioName(context);
- addChildField(scenarioName.getField());
+ addChildFieldFor(this.scenarioName = new GqlvScenarioName(context));
this.scenarioStep = new GqlvScenarioStep(context);
addChildField(scenarioStep.newField("Given"));
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java
index a852daaa71..4411e63aa5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java
@@ -6,6 +6,8 @@ import java.util.Objects;
import graphql.schema.DataFetchingEnvironment;
+import lombok.val;
+
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.viewer.graphql.model.context.Context;
@@ -36,16 +38,16 @@ public class GqlvScenarioStep
if (Objects.requireNonNull(objectSpec.getBeanSort()) == BeanSort.MANAGED_BEAN_CONTRIBUTING) { // @DomainService
context.serviceRegistry.lookupBeanById(objectSpec.getLogicalTypeName())
.ifPresent(servicePojo -> {
- GqlvDomainService gqlvDomainService = GqlvDomainService.of(objectSpec, servicePojo, context);
- addChildField(gqlvDomainService.getField());
+ val gqlvDomainService = GqlvDomainService.of(objectSpec, servicePojo, context);
+ addChildFieldFor(gqlvDomainService);
domainServices.add(gqlvDomainService);
});
}
});
// add domain object lookup to top-level query
- for (GqlvDomainObject domainObject : this.domainObjects) {
- addChildField(domainObject.getField());
+ for (val gqlvDomainObject : this.domainObjects) {
+ addChildFieldFor(gqlvDomainObject);
}
buildObjectType();
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java
index 3fa541054f..20a692f50f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java
@@ -57,13 +57,13 @@ public class GqlvTopLevelMutation
public void addAction(ObjectSpecification objectSpec, final ObjectAction objectAction) {
val gqlvMutationForAction = new GqlvMutationForAction(objectSpec, objectAction, context);
- addChildField(gqlvMutationForAction.getField());
+ addChildFieldFor(gqlvMutationForAction);
actions.add(gqlvMutationForAction);
}
public void addProperty(ObjectSpecification objectSpec, final OneToOneAssociation property) {
val gqlvMutationForProperty = new GqlvMutationForProperty(objectSpec, property, context);
- addChildField(gqlvMutationForProperty.getField());
+ addChildFieldFor(gqlvMutationForProperty);
properties.add(gqlvMutationForProperty);
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java
index 1668709db0..b0baf4d332 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java
@@ -6,6 +6,8 @@ import java.util.List;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLObjectType;
+import lombok.val;
+
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainObject;
@@ -44,8 +46,8 @@ public class GqlvTopLevelQuery
case MANAGED_BEAN_CONTRIBUTING: // @DomainService
context.serviceRegistry.lookupBeanById(objectSpec.getLogicalTypeName())
.ifPresent(servicePojo -> {
- GqlvDomainService gqlvDomainService = GqlvDomainService.of(objectSpec, servicePojo, context);
- addChildField(gqlvDomainService.getField());
+ val gqlvDomainService = GqlvDomainService.of(objectSpec, servicePojo, context);
+ addChildFieldFor(gqlvDomainService);
domainServices.add(gqlvDomainService);
});
break;
@@ -53,12 +55,11 @@ public class GqlvTopLevelQuery
});
// add domain object lookup to top-level query
- for (GqlvDomainObject domainObject : this.domainObjects) {
- addChildField(domainObject.getField());
+ for (val gqlvDomainObject : this.domainObjects) {
+ addChildFieldFor(gqlvDomainObject);
}
- scenario = new GqlvScenario(context);
- addChildField(scenario.getField());
+ addChildFieldFor(scenario = new GqlvScenario(context));
buildObjectType();
}
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql
index 5876019ffb..b18a3e5a64 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department._.gql
@@ -32,7 +32,6 @@
version
cssClass
iconName
- grid
}
}
}
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json
index 1929ae96ef..4548f25fb4 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.create_staff_member_with_department.approved.json
@@ -32,8 +32,7 @@
"logicalTypeName" : "university.dept.StaffMember",
"version" : null,
"cssClass" : null,
- "iconName" : null,
- "grid" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?><bs:grid xmlns:bs=\"https://causeway.apache.org/applib/layout/grid/bootstrap3\" xmlns:lnk=\"https://causeway.apache.org/applib/layout/links\" xmlns:cpt=\"https://causeway.apache.org/applib/layout/component\">\n <bs:row>\n <bs:col span=\"12\" unreferencedActions=\"true\">\n <cpt:domainObject bookmarking=\"AS_ROOT\"/>\n </bs:col>\n </bs:row>\n <bs:row>\n <bs:col span=\"4\">\n [...]
+ "iconName" : null
}
}
}
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java
index 1c28790e91..1f52b24e61 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.viewer.graphql.viewer;
-import org.apache.causeway.viewer.graphql.viewer.controller.BlobBytesController;
+import org.apache.causeway.viewer.graphql.viewer.controller.ResourceController;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
@@ -47,7 +47,7 @@ import org.apache.causeway.viewer.graphql.model.CausewayModuleViewerGraphqlModel
GraphQlWebMvcAutoConfiguration.class,
// controllers
- BlobBytesController.class
+ ResourceController.class
})
@EnableConfigurationProperties({
GraphQlProperties.class, GraphQlCorsProperties.class
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/BlobBytesController.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/ResourceController.java
similarity index 71%
rename from viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/BlobBytesController.java
rename to viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/ResourceController.java
index a72670ce79..2b388ce3cf 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/BlobBytesController.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/ResourceController.java
@@ -2,12 +2,14 @@ package org.apache.causeway.viewer.graphql.viewer.controller;
import javax.inject.Inject;
+import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import org.springframework.http.ContentDisposition;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
+import org.springframework.util.MimeType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +29,7 @@ import java.util.Optional;
@RestController()
@RequestMapping("/graphql/object")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
-public class BlobBytesController {
+public class ResourceController {
private final BookmarkService bookmarkService;
private final ObjectManager objectManager;
@@ -38,23 +40,44 @@ public class BlobBytesController {
@PathVariable final String id,
@PathVariable final String propertyId) {
- return bookmarkService.lookup(Bookmark.forLogicalTypeNameAndIdentifier(logicalTypeName, id))
- .map(objectManager::adapt)
- .map(managedObject -> ManagedObjectAndPropertyIfAny.of(managedObject, managedObject.getSpecification().getProperty(propertyId)))
- .filter(ManagedObjectAndPropertyIfAny::isPropertyPresent)
- .map(ManagedObjectAndProperty::of)
- .map(ManagedObjectAndProperty::value)
- .map(ManagedObject::getPojo)
+ return valueOf(logicalTypeName, id, propertyId)
.filter(Blob.class::isInstance)
.map(Blob.class::cast)
.map(blob -> ResponseEntity.ok()
- .contentType(MediaType.APPLICATION_PDF)
+ .contentType(MediaType.asMediaType(MimeType.valueOf(blob.getMimeType().toString())))
.header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename(blob.getName()).build().toString())
.contentLength(blob.getBytes().length)
.body(blob.getBytes()))
.orElse(ResponseEntity.notFound().build());
}
+ @GetMapping(value = "/{logicalTypeName}:{id}/{propertyId}/clobChars")
+ public ResponseEntity<CharSequence> propertyClobChars(
+ @PathVariable final String logicalTypeName,
+ @PathVariable final String id,
+ @PathVariable final String propertyId) {
+
+ return valueOf(logicalTypeName, id, propertyId)
+ .filter(Clob.class::isInstance)
+ .map(Clob.class::cast)
+ .map(clob -> ResponseEntity.ok()
+ .contentType(MediaType.asMediaType(MimeType.valueOf(clob.getMimeType().toString())))
+ .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename(clob.getName()).build().toString())
+ .contentLength(clob.getChars().length())
+ .body(clob.getChars()))
+ .orElse(ResponseEntity.notFound().build());
+ }
+
+ private Optional<Object> valueOf(String logicalTypeName, String id, String propertyId) {
+ return bookmarkService.lookup(Bookmark.forLogicalTypeNameAndIdentifier(logicalTypeName, id))
+ .map(objectManager::adapt)
+ .map(managedObject -> ManagedObjectAndPropertyIfAny.of(managedObject, managedObject.getSpecification().getProperty(propertyId)))
+ .filter(ManagedObjectAndPropertyIfAny::isPropertyPresent)
+ .map(ManagedObjectAndProperty::of)
+ .map(ManagedObjectAndProperty::value)
+ .map(ManagedObject::getPojo);
+ }
+
@Value(staticConstructor = "of")
private static class ManagedObjectAndPropertyIfAny {
ManagedObject owningObject;
(causeway) 02/02: CAUSEWAY-3676: reorg imports is all
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit f3cd97b0da433996188fbc2c8a79597da32305d2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 15 08:21:03 2024 +0000
CAUSEWAY-3676: reorg imports is all
---
.../causeway/viewer/graphql/model/context/Context.java | 14 +++++++-------
.../viewer/graphql/model/domain/GqlvAbstract.java | 5 +++--
.../graphql/model/domain/GqlvAbstractCustom.java | 8 ++++----
.../viewer/graphql/model/domain/GqlvAction.java | 10 ++++------
.../viewer/graphql/model/domain/GqlvActionInvoke.java | 2 +-
.../viewer/graphql/model/domain/GqlvActionParam.java | 1 -
.../model/domain/GqlvActionParamAutoComplete.java | 2 +-
.../graphql/model/domain/GqlvActionParamChoices.java | 2 +-
.../graphql/model/domain/GqlvActionParamDisabled.java | 4 ++--
.../graphql/model/domain/GqlvActionParamHidden.java | 4 ++--
.../graphql/model/domain/GqlvActionParamValidate.java | 4 ++--
.../viewer/graphql/model/domain/GqlvActionParams.java | 5 +++--
.../graphql/model/domain/GqlvActionValidity.java | 2 +-
.../graphql/model/domain/GqlvAssociationDatatype.java | 5 +++--
.../viewer/graphql/model/domain/GqlvDomainService.java | 4 ++--
.../viewer/graphql/model/domain/GqlvMember.java | 4 ++--
.../graphql/model/domain/GqlvMemberDisabled.java | 2 +-
.../viewer/graphql/model/domain/GqlvMemberHidden.java | 2 +-
.../causeway/viewer/graphql/model/domain/GqlvMeta.java | 3 ++-
.../viewer/graphql/model/domain/GqlvMetaCssClass.java | 6 +++---
.../viewer/graphql/model/domain/GqlvMetaGrid.java | 6 +++---
.../viewer/graphql/model/domain/GqlvMetaIconName.java | 6 +++---
.../viewer/graphql/model/domain/GqlvMetaId.java | 6 +++---
.../viewer/graphql/model/domain/GqlvMetaLayout.java | 6 +++---
.../viewer/graphql/model/domain/GqlvMetaSaveAs.java | 4 +---
.../viewer/graphql/model/domain/GqlvMetaVersion.java | 6 +++---
.../viewer/graphql/model/domain/GqlvProperty.java | 2 --
.../model/domain/GqlvPropertyGetBlobAbstract.java | 3 +--
.../graphql/model/domain/GqlvPropertyGetBlobBytes.java | 8 ++++----
.../model/domain/GqlvPropertyGetClobAbstract.java | 2 --
.../viewer/graphql/model/domain/GqlvPropertySet.java | 9 +++++----
.../graphql/model/domain/GqlvPropertyValidate.java | 4 ++--
.../viewer/graphql/model/domain/GqlvScenario.java | 8 ++++----
.../viewer/graphql/model/domain/GqlvScenarioName.java | 5 +++--
.../viewer/graphql/model/domain/GqlvScenarioStep.java | 4 ++--
.../model/marshallers/ScalarMarshallerBigDecimal.java | 10 ++++------
.../model/marshallers/ScalarMarshallerBigInteger.java | 10 ++++------
.../marshallers/ScalarMarshallerBooleanPrimitive.java | 10 ++++------
.../marshallers/ScalarMarshallerBooleanWrapper.java | 10 ++++------
.../marshallers/ScalarMarshallerBytePrimitive.java | 3 +--
.../model/marshallers/ScalarMarshallerByteWrapper.java | 9 ++++-----
.../marshallers/ScalarMarshallerCharPrimitive.java | 9 ++++-----
.../marshallers/ScalarMarshallerCharacterWrapper.java | 3 +--
.../marshallers/ScalarMarshallerDoublePrimitive.java | 10 ++++------
.../marshallers/ScalarMarshallerDoubleWrapper.java | 10 ++++------
.../marshallers/ScalarMarshallerFloatPrimitive.java | 10 ++++------
.../marshallers/ScalarMarshallerFloatWrapper.java | 6 ++----
.../marshallers/ScalarMarshallerIntPrimitive.java | 10 ++++------
.../marshallers/ScalarMarshallerIntegerWrapper.java | 10 ++++------
.../marshallers/ScalarMarshallerJdk8LocalDate.java | 10 ++++------
.../marshallers/ScalarMarshallerJdk8ZonedDateTime.java | 9 ++++-----
.../marshallers/ScalarMarshallerJodaDateTime.java | 11 +++++------
.../marshallers/ScalarMarshallerJodaLocalDate.java | 12 +++++-------
.../marshallers/ScalarMarshallerLongPrimitive.java | 10 ++++------
.../model/marshallers/ScalarMarshallerLongWrapper.java | 10 ++++------
.../model/marshallers/ScalarMarshallerObject.java | 4 ++--
.../marshallers/ScalarMarshallerShortPrimitive.java | 10 ++++------
.../marshallers/ScalarMarshallerShortWrapper.java | 10 ++++------
.../model/marshallers/ScalarMarshallerString.java | 10 ++++------
.../marshallers/ScalarMarshallerVoidPrimitive.java | 9 ++++-----
.../model/marshallers/ScalarMarshallerVoidWrapper.java | 3 +--
.../graphql/model/registry/GraphQLTypeRegistry.java | 18 +++++++++---------
.../graphql/model/toplevel/GqlvTopLevelMutation.java | 5 +++--
.../graphql/model/toplevel/GqlvTopLevelQuery.java | 4 ++--
.../viewer/graphql/model/types/ScalarMapper.java | 2 +-
.../types/ScalarMapperUsingScalarMarshallers.java | 10 +++++-----
.../viewer/graphql/model/types/TypeMapper.java | 8 ++++----
.../viewer/graphql/model/types/TypeMapperDefault.java | 17 +++++++++--------
.../test/e2e/queryandmutations/Admin_IntegTest.java | 1 +
.../e2e/queryandmutations/Calculator_IntegTest.java | 1 +
.../DepartmentMutating_IntegTest.java | 1 +
.../e2e/queryandmutations/Department_IntegTest.java | 10 +---------
.../queryandmutations/DeptHeadMutating_IntegTest.java | 1 +
.../test/e2e/queryandmutations/DeptHead_IntegTest.java | 3 +--
.../e2e/queryandmutations/StaffMutating_IntegTest.java | 1 +
.../test/e2e/queryandmutations/Staff_IntegTest.java | 11 +++++++----
.../viewer/test/e2e/scenario/Calculator_IntegTest.java | 1 +
.../viewer/test/e2e/scenario/Department_IntegTest.java | 1 +
.../test/schema/GqlSchemaQuery_print_IntegTest.java | 1 +
.../viewer/CausewayModuleViewerGraphqlViewer.java | 3 +--
.../viewer/auth/UserMementoProviderDefault.java | 6 +++---
.../graphql/viewer/controller/ResourceController.java | 9 ++++-----
...yncExecutionStrategyResolvingWithinInteraction.java | 10 +++++-----
.../viewer/integration/GraphQlSourceForCauseway.java | 7 ++++---
84 files changed, 242 insertions(+), 285 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 4278015d26..4eeed6e2b5 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,8 +18,15 @@
*/
package org.apache.causeway.viewer.graphql.model.context;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import graphql.schema.GraphQLCodeRegistry;
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.id.HasLogicalType;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
@@ -36,15 +43,8 @@ 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.springframework.stereotype.Component;
-
import lombok.RequiredArgsConstructor;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
@Component
@RequiredArgsConstructor
public class Context {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java
index 5df220cf9b..77f9681592 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstract.java
@@ -18,10 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
-import org.apache.causeway.viewer.graphql.model.context.Context;
-
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
+
+import org.apache.causeway.viewer.graphql.model.context.Context;
+
import lombok.Getter;
public abstract class GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
index 5d4e78a012..6c955fbb92 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAbstractCustom.java
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import java.util.Optional;
+
import graphql.schema.FieldCoordinates;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLObjectType;
@@ -25,15 +27,13 @@ import graphql.schema.GraphQLObjectType;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLObjectType.newObject;
-import org.apache.causeway.viewer.graphql.model.context.Context;
-
import org.springframework.lang.Nullable;
+import org.apache.causeway.viewer.graphql.model.context.Context;
+
import lombok.AccessLevel;
import lombok.Getter;
-import java.util.Optional;
-
public abstract class GqlvAbstractCustom extends GqlvAbstract implements Parent {
protected final GraphQLObjectType.Builder gqlObjectTypeBuilder;
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 7c46953a23..48cae6a1af 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
@@ -23,10 +23,13 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.config.CausewayConfiguration;
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;
@@ -37,11 +40,6 @@ 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.types.TypeMapper;
-import static org.apache.causeway.core.config.CausewayConfiguration.Viewer.Graphql.ApiVariant.QUERY_WITH_MUTATIONS_NON_SPEC_COMPLIANT;
-
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 2d7391f43f..dd8ab2a702 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
@@ -35,13 +35,13 @@ 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.feature.ObjectAction;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
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.apache.causeway.viewer.graphql.model.types.TypeMapper;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 6cf6e6df7a..a989c38b4a 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
@@ -34,7 +34,6 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
import lombok.Getter;
-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/GqlvActionParamAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java
index 87022bf123..9d5e3083ed 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
@@ -38,12 +38,12 @@ package org.apache.causeway.viewer.graphql.model.domain;
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.types.TypeMapper;
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;
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 1090855793..573a49b9c1 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
@@ -36,12 +36,12 @@ package org.apache.causeway.viewer.graphql.model.domain;
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.types.TypeMapper;
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;
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 e324829774..3b4d472110 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
@@ -20,6 +20,7 @@ package org.apache.causeway.viewer.graphql.model.domain;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLOutputType;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
@@ -28,14 +29,13 @@ import org.apache.causeway.commons.collections.Can;
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;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
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.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.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 24524fc935..00d88d4e66 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
@@ -20,6 +20,7 @@ package org.apache.causeway.viewer.graphql.model.domain;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
+ import graphql.schema.GraphQLOutputType;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
@@ -28,14 +29,13 @@ package org.apache.causeway.viewer.graphql.model.domain;
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;
- import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
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.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 3043f7570e..18d7efb80f 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
@@ -20,6 +20,7 @@ package org.apache.causeway.viewer.graphql.model.domain;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLOutputType;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
@@ -28,14 +29,13 @@ import org.apache.causeway.commons.collections.Can;
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;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
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.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 0eccf8d435..5e4b9e05ef 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
@@ -22,6 +22,9 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -34,8 +37,6 @@ 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.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 c33847e1cc..ae8ff6f8d7 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
@@ -32,11 +32,11 @@ 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;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
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.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;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationDatatype.java
index b49248cfa8..02b5a220e5 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationDatatype.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationDatatype.java
@@ -18,14 +18,15 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationProvider;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> extends GqlvAbstract {
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 7a51948524..845d93fd0a 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
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.domain;
import java.util.LinkedHashMap;
import java.util.Map;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.core.config.CausewayConfiguration;
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.viewer.graphql.model.context.Context;
-import graphql.schema.DataFetchingEnvironment;
-
import lombok.Getter;
import lombok.val;
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 be1ab35bcb..84e251673c 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
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.schema.DataFetchingEnvironment;
+
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.fetcher.BookmarkedPojo;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import graphql.schema.DataFetchingEnvironment;
-
import lombok.Getter;
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 b4ca62fac5..655dd09176 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
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.graphql.model.domain;
import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
@@ -31,7 +32,6 @@ 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 graphql.schema.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 808a61d130..e4a71fe928 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
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.graphql.model.domain;
import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLOutputType;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
@@ -31,7 +32,6 @@ 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 graphql.schema.GraphQLOutputType;
import lombok.val;
import lombok.extern.log4j.Log4j2;
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 bd12ca4380..9dfa5ede87 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
@@ -21,6 +21,8 @@ package org.apache.causeway.viewer.graphql.model.domain;
import java.util.Objects;
import java.util.Optional;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.metamodel.BeanSort;
@@ -34,7 +36,6 @@ import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvMeta extends GqlvAbstractCustom {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaCssClass.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaCssClass.java
index 2931bf5383..77d9dd781c 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaCssClass.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaCssClass.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaCssClass extends GqlvAbstract {
public GqlvMetaCssClass(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaGrid.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaGrid.java
index ee22f29908..a9ab27a51a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaGrid.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaGrid.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaGrid extends GqlvAbstract {
public GqlvMetaGrid(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaIconName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaIconName.java
index 6fbbd5d836..d6b841fde6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaIconName.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaIconName.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaIconName extends GqlvAbstract {
public GqlvMetaIconName(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaId.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaId.java
index 8cca8465d6..0d1e170ce7 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaId.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaId.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLNonNull.nonNull;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaId extends GqlvAbstract {
public GqlvMetaId(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaLayout.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaLayout.java
index 56657b8400..2a17f67e74 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaLayout.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaLayout.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaLayout extends GqlvAbstract {
public GqlvMetaLayout(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaSaveAs.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaSaveAs.java
index 62d54a1567..b036fa5d84 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaSaveAs.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaSaveAs.java
@@ -23,13 +23,11 @@ import graphql.Scalars;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLArgument;
-import java.util.concurrent.atomic.AtomicInteger;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
public class GqlvMetaSaveAs extends GqlvAbstract {
public GqlvMetaSaveAs(final Context context) {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaVersion.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaVersion.java
index 73dd44a38f..64297d7d13 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaVersion.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMetaVersion.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
-
public class GqlvMetaVersion extends GqlvAbstract {
public GqlvMetaVersion(final Context context) {
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 f6ffed52d3..4cb27880ab 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
@@ -23,9 +23,7 @@ import graphql.schema.GraphQLFieldDefinition;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
-import org.apache.causeway.core.config.CausewayConfiguration;
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.OneToOneAssociation;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobAbstract.java
index b2a9d79136..b5d0b0ec4d 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobAbstract.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobAbstract.java
@@ -23,14 +23,13 @@ import java.util.function.Function;
import graphql.Scalars;
import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
-import graphql.schema.GraphQLFieldDefinition;
-
import lombok.val;
public abstract class GqlvPropertyGetBlobAbstract extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobBytes.java
index 5e2246d39c..2c1fe83471 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobBytes.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetBlobBytes.java
@@ -18,16 +18,16 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
-import graphql.schema.DataFetchingEnvironment;
-
-import lombok.val;
-
import java.util.Optional;
+import graphql.schema.DataFetchingEnvironment;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
+import lombok.val;
+
public class GqlvPropertyGetBlobBytes extends GqlvPropertyGetBlobAbstract {
public GqlvPropertyGetBlobBytes(
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobAbstract.java
index 87107f919c..aa5e3eeb4a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobAbstract.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGetClobAbstract.java
@@ -28,8 +28,6 @@ import graphql.schema.GraphQLFieldDefinition;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract;
-import org.apache.causeway.viewer.graphql.model.domain.GqlvPropertyGet;
import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo;
import lombok.val;
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 a7e764d6ad..d45109e3a5 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,10 +18,13 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
import java.util.Map;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
+
+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;
@@ -35,8 +38,6 @@ 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 graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLFieldDefinition;
import lombok.val;
public class GqlvPropertySet extends GqlvAbstract {
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 ce6f42ad22..6eb5511c23 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
@@ -20,19 +20,19 @@ package org.apache.causeway.viewer.graphql.model.domain;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLOutputType;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
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;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
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 graphql.schema.GraphQLOutputType;
import lombok.val;
public class GqlvPropertyValidate extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java
index 07e4f851bf..a57c16bde0 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java
@@ -18,14 +18,14 @@
*/
package org.apache.causeway.viewer.graphql.model.domain;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-
-import org.apache.causeway.viewer.graphql.model.context.Context;
-
import graphql.Scalars;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLArgument;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+
+import org.apache.causeway.viewer.graphql.model.context.Context;
+
/**
* 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/GqlvScenarioName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioName.java
index 1769b6dade..182ca46f01 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioName.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioName.java
@@ -1,11 +1,12 @@
package org.apache.causeway.viewer.graphql.model.domain;
+import graphql.Scalars;
+import graphql.schema.DataFetchingEnvironment;
+
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import org.apache.causeway.viewer.graphql.model.context.Context;
-import graphql.Scalars;
-import graphql.schema.DataFetchingEnvironment;
import lombok.val;
public class GqlvScenarioName extends GqlvAbstract {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java
index 4411e63aa5..785f4dcf93 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioStep.java
@@ -6,11 +6,11 @@ import java.util.Objects;
import graphql.schema.DataFetchingEnvironment;
-import lombok.val;
-
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.viewer.graphql.model.context.Context;
+import lombok.val;
+
public class GqlvScenarioStep
extends GqlvAbstractCustom
implements Parent {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java
index 6b189fe064..515a3f905a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigDecimal.java
@@ -18,21 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import java.math.BigDecimal;
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java
index 6b44632538..4e14d0723a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBigInteger.java
@@ -18,21 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import java.math.BigInteger;
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java
index c6048da4b9..2fc85f0431 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanPrimitive.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java
index 08955dbee8..81d1759152 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBooleanWrapper.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java
index 9a05974c08..b7b198c6c1 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerBytePrimitive.java
@@ -23,12 +23,11 @@ import javax.inject.Inject;
import graphql.Scalars;
-import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
@Component
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java
index 49ff2274e6..18016d6223 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerByteWrapper.java
@@ -18,18 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java
index 0a6536dc72..6db6b0898f 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharPrimitive.java
@@ -18,18 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java
index c63ed294b5..e8c96f79f2 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerCharacterWrapper.java
@@ -23,12 +23,11 @@ import javax.inject.Inject;
import graphql.Scalars;
-import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
@Component
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java
index 112a0a99a5..53647f6166 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoublePrimitive.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java
index 9da9207f5b..582c1d73b7 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerDoubleWrapper.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java
index d7f17015b5..a2bc58347e 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatPrimitive.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java
index 0604a64e71..299caf77ae 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerFloatWrapper.java
@@ -23,13 +23,11 @@ import javax.inject.Inject;
import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
-import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
@Component
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java
index 4e517b2ff5..94de2c3dd3 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntPrimitive.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java
index 4166c9bdfc..08549cc575 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerIntegerWrapper.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java
index 92146c37e8..dd1a378690 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8LocalDate.java
@@ -18,22 +18,20 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java
index 591fbb5fee..6451bf629a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJdk8ZonedDateTime.java
@@ -18,21 +18,20 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java
index c50b2df9be..94888ae654 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaDateTime.java
@@ -18,20 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
-import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
+import graphql.Scalars;
import org.joda.time.DateTime;
import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
+
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java
index a1847b1f60..06739664e6 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerJodaLocalDate.java
@@ -18,21 +18,19 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.CausewayConfiguration;
-
-import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
+import graphql.Scalars;
import org.joda.time.LocalDate;
import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
+
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java
index b8b0ca9061..62f059336a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongPrimitive.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java
index 1f12f2e665..190b372a8c 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerLongWrapper.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
/**
* Maps to a string to avoid loss of precision.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java
index 195fed4759..3d1c1b9f6a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerObject.java
@@ -21,14 +21,14 @@ package org.apache.causeway.viewer.graphql.model.marshallers;
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import graphql.Scalars;
-
/**
* Acts as a fallback. We put it last in the list
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java
index 010933db7c..2763d06d4b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortPrimitive.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java
index 197f4c0bbf..20393403d4 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerShortWrapper.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java
index 8081b04c6c..00debcec64 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerString.java
@@ -18,19 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import graphql.Scalars;
-import org.apache.causeway.core.config.CausewayConfiguration;
+import org.springframework.stereotype.Component;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java
index c99b483df8..af64c15707 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidPrimitive.java
@@ -18,18 +18,17 @@
*/
package org.apache.causeway.viewer.graphql.model.marshallers;
-import graphql.Scalars;
-
import javax.annotation.Priority;
import javax.inject.Inject;
+import graphql.Scalars;
+
+import org.springframework.stereotype.Component;
+
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
-
import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-import org.springframework.stereotype.Component;
-
@Component
@Priority(PriorityPrecedence.LATE)
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java
index 296cfc506d..ff9590ab84 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/marshallers/ScalarMarshallerVoidWrapper.java
@@ -23,12 +23,11 @@ import javax.inject.Inject;
import graphql.Scalars;
-import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
-
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshallerAbstract;
@Component
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 61c1d6047e..6028b78033 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
@@ -25,26 +25,26 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import javax.inject.Inject;
+import javax.inject.Provider;
+
import graphql.schema.GraphQLEnumType;
import graphql.schema.GraphQLInputObjectType;
import graphql.schema.GraphQLNamedType;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLType;
-import org.apache.causeway.viewer.graphql.model.context.Context;
-import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
+import static graphql.schema.GraphQLEnumType.newEnum;
+import static graphql.schema.GraphQLEnumValueDefinition.newEnumValueDefinition;
import org.springframework.stereotype.Component;
+import org.apache.causeway.viewer.graphql.model.context.Context;
+import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
+
import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
import lombok.val;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-import static graphql.schema.GraphQLEnumType.newEnum;
-import static graphql.schema.GraphQLEnumValueDefinition.newEnumValueDefinition;
+import lombok.extern.log4j.Log4j2;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java
index 20a692f50f..45c75039ae 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java
@@ -3,6 +3,9 @@ package org.apache.causeway.viewer.graphql.model.toplevel;
import java.util.ArrayList;
import java.util.List;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLObjectType;
+
import org.apache.causeway.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
@@ -14,8 +17,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvMutationForAction;
import org.apache.causeway.viewer.graphql.model.domain.GqlvMutationForProperty;
import org.apache.causeway.viewer.graphql.model.domain.Parent;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.GraphQLObjectType;
import lombok.val;
public class GqlvTopLevelMutation
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java
index b0baf4d332..0dee8a582a 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java
@@ -6,8 +6,6 @@ import java.util.List;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.GraphQLObjectType;
-import lombok.val;
-
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom;
import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainObject;
@@ -15,6 +13,8 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainService;
import org.apache.causeway.viewer.graphql.model.domain.GqlvScenario;
import org.apache.causeway.viewer.graphql.model.domain.Parent;
+import lombok.val;
+
public class GqlvTopLevelQuery
extends GqlvAbstractCustom
implements Parent {
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapper.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapper.java
index 2487af7f2c..bb7efbcacf 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapper.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
-import graphql.schema.*;
+import graphql.schema.GraphQLScalarType;
/**
* Internal SPI.
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java
index f6d6c6739c..06e8f5ce43 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapperUsingScalarMarshallers.java
@@ -18,23 +18,23 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
-import graphql.schema.*;
-
-import lombok.RequiredArgsConstructor;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
-import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshaller;
+import graphql.schema.GraphQLScalarType;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
+import org.apache.causeway.viewer.graphql.applib.marshallers.ScalarMarshaller;
+
+import lombok.RequiredArgsConstructor;
+
/**
* Internal (default) implementation of {@link ScalarMapper} that implements the chain-of-responsibility
* pattern over an injected list of all known {@link ScalarMarshaller} components.
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 8a3ae353b1..0f3b29a8b3 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,6 +18,10 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -25,10 +29,6 @@ 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 graphql.schema.GraphQLInputType;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-
/**
* Internal SPI to map framework's own datatypes to GraphQL's types.
*
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 6b4392a33a..780d4c641f 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,12 +18,18 @@
*/
package org.apache.causeway.viewer.graphql.model.types;
-import static graphql.schema.GraphQLNonNull.nonNull;
-import static graphql.schema.GraphQLTypeReference.typeRef;
-
import javax.inject.Inject;
import javax.inject.Provider;
+import graphql.Scalars;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLOutputType;
+import graphql.schema.GraphQLTypeReference;
+
+import static graphql.schema.GraphQLNonNull.nonNull;
+import static graphql.schema.GraphQLTypeReference.typeRef;
+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -36,11 +42,6 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToOneFeature;
import org.apache.causeway.viewer.graphql.model.context.Context;
import org.apache.causeway.viewer.graphql.model.domain.TypeNames;
-import graphql.Scalars;
-import graphql.schema.GraphQLInputType;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLOutputType;
-import graphql.schema.GraphQLTypeReference;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Admin_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Admin_IntegTest.java
index db6703705e..bc12c60fde 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Admin_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Admin_IntegTest.java
@@ -23,6 +23,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Calculator_IntegTest.java
index bfbd458021..24b72688ab 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Calculator_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Calculator_IntegTest.java
@@ -23,6 +23,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DepartmentMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DepartmentMutating_IntegTest.java
index c083babf58..8e08aa42a1 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DepartmentMutating_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DepartmentMutating_IntegTest.java
@@ -25,6 +25,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.java
index a24e276e2f..55e23e5054 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Department_IntegTest.java
@@ -18,18 +18,11 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.e2e.queryandmutations;
-import java.util.ArrayList;
import java.util.List;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
-
import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
-import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -38,10 +31,9 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.Department;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DeptHead;
+import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
import lombok.val;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.java
index 428f2f1a16..46799d4b15 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHeadMutating_IntegTest.java
@@ -25,6 +25,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHead_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHead_IntegTest.java
index 360e35f179..8cc2cd5ff3 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHead_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/DeptHead_IntegTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.e2e.queryandmutations;
-import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
-
import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
@@ -32,6 +30,7 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DeptHead;
+import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
//NOT USING @Transactional since we are running server within same transaction otherwise
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.java
index baa0018cbc..4a594ab762 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/StaffMutating_IntegTest.java
@@ -23,6 +23,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.java
index 0dbe1d0d77..f5568939cc 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/queryandmutations/Staff_IntegTest.java
@@ -25,24 +25,27 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.Optional;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
-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.springframework.test.context.ActiveProfiles;
+import org.springframework.transaction.annotation.Propagation;
+
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.StaffMember;
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.val;
//NOT USING @Transactional since we are running server within same transaction otherwise
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java
index 46a8b4e08c..bb57a593f8 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java
@@ -23,6 +23,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.java
index a759e628a2..82d253d988 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Department_IntegTest.java
@@ -23,6 +23,7 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest;
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchemaQuery_print_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchemaQuery_print_IntegTest.java
index c0b00b221c..275810d940 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchemaQuery_print_IntegTest.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchemaQuery_print_IntegTest.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.graphql.viewer.test.schema;
import org.junit.jupiter.api.Order;
+
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.transaction.annotation.Transactional;
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java
index 1f52b24e61..978fe709d2 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/CausewayModuleViewerGraphqlViewer.java
@@ -18,8 +18,6 @@
*/
package org.apache.causeway.viewer.graphql.viewer;
-import org.apache.causeway.viewer.graphql.viewer.controller.ResourceController;
-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
import org.springframework.boot.autoconfigure.graphql.GraphQlCorsProperties;
@@ -34,6 +32,7 @@ import org.springframework.graphql.execution.BatchLoaderRegistry;
import org.springframework.graphql.execution.DefaultBatchLoaderRegistry;
import org.apache.causeway.viewer.graphql.model.CausewayModuleViewerGraphqlModel;
+import org.apache.causeway.viewer.graphql.viewer.controller.ResourceController;
@Configuration
@Import({
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
index d01ea5ebb1..f15c442ace 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
@@ -20,6 +20,9 @@ package org.apache.causeway.viewer.graphql.viewer.auth;
import javax.inject.Inject;
+import graphql.execution.ExecutionContext;
+import graphql.execution.ExecutionStrategyParameters;
+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -33,9 +36,6 @@ import org.apache.causeway.viewer.graphql.applib.auth.UserMementoProvider;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import graphql.execution.ExecutionContext;
-import graphql.execution.ExecutionStrategyParameters;
-
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class UserMementoProviderDefault implements UserMementoProvider {
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/ResourceController.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/ResourceController.java
index 2b388ce3cf..2c596e135f 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/ResourceController.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/controller/ResourceController.java
@@ -1,9 +1,8 @@
package org.apache.causeway.viewer.graphql.viewer.controller;
-import javax.inject.Inject;
+import java.util.Optional;
-import org.apache.causeway.applib.value.Clob;
-import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+import javax.inject.Inject;
import org.springframework.http.ContentDisposition;
import org.springframework.http.HttpHeaders;
@@ -18,14 +17,14 @@ import org.springframework.web.bind.annotation.RestController;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.value.Blob;
+import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
+import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.RequiredArgsConstructor;
import lombok.Value;
-import java.util.Optional;
-
@RestController()
@RequestMapping("/graphql/object")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
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 730428732a..ab63438dba 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,6 +20,11 @@ package org.apache.causeway.viewer.graphql.viewer.integration;
import java.util.concurrent.CompletableFuture;
+import graphql.execution.AsyncExecutionStrategy;
+import graphql.execution.ExecutionContext;
+import graphql.execution.ExecutionStrategyParameters;
+import graphql.execution.FieldValueInfo;
+
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
@@ -28,11 +33,6 @@ import org.apache.causeway.viewer.graphql.applib.auth.UserMementoProvider;
import lombok.val;
-import graphql.execution.AsyncExecutionStrategy;
-import graphql.execution.ExecutionContext;
-import graphql.execution.ExecutionStrategyParameters;
-import graphql.execution.FieldValueInfo;
-
@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 826958faa2..2404d5f950 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
@@ -21,6 +21,10 @@ package org.apache.causeway.viewer.graphql.viewer.integration;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import graphql.GraphQL;
+import graphql.execution.SimpleDataFetcherExceptionHandler;
+import graphql.schema.GraphQLSchema;
+
import org.springframework.graphql.execution.GraphQlSource;
import org.springframework.stereotype.Service;
@@ -33,9 +37,6 @@ import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
import org.apache.causeway.viewer.graphql.model.toplevel.GqlvTopLevelMutation;
import org.apache.causeway.viewer.graphql.model.toplevel.GqlvTopLevelQuery;
-import graphql.GraphQL;
-import graphql.execution.SimpleDataFetcherExceptionHandler;
-import graphql.schema.GraphQLSchema;
import lombok.RequiredArgsConstructor;
import lombok.val;