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 32c8a2d7634f6476cc2edfdeed448614c5b69352 Author: danhaywood <[email protected]> AuthorDate: Sun Jan 28 16:07:34 2024 +0000 CAUSEWAY-3676: reorg imports --- .editorconfig | 2 +- .../viewer/graphql/applib/types/TypeMapper.java | 10 ++-- .../viewer/graphql/model/context/Context.java | 3 -- .../viewer/graphql/model/domain/GqlvAction.java | 28 +++++------ .../graphql/model/domain/GqlvActionInvoke.java | 13 ++--- .../graphql/model/domain/GqlvActionParam.java | 11 +++-- .../model/domain/GqlvActionParamAutoComplete.java | 55 +++++++++++----------- .../model/domain/GqlvActionParamChoices.java | 53 +++++++++++---------- .../model/domain/GqlvActionParamDefault.java | 41 ++++++++-------- .../model/domain/GqlvActionParamDisabled.java | 7 +-- .../model/domain/GqlvActionParamHidden.java | 37 ++++++++------- .../model/domain/GqlvActionParamValidate.java | 7 +-- .../graphql/model/domain/GqlvActionParams.java | 17 +++---- .../graphql/model/domain/GqlvActionValidity.java | 13 ++--- .../graphql/model/domain/GqlvAssociation.java | 4 +- .../graphql/model/domain/GqlvAssociationGet.java | 7 +-- .../graphql/model/domain/GqlvCollection.java | 8 ++-- .../graphql/model/domain/GqlvCollectionGet.java | 5 +- .../graphql/model/domain/GqlvDomainObject.java | 27 +++++------ .../graphql/model/domain/GqlvDomainService.java | 19 ++++---- .../viewer/graphql/model/domain/GqlvMember.java | 3 +- .../graphql/model/domain/GqlvMemberDisabled.java | 5 +- .../graphql/model/domain/GqlvMemberHidden.java | 5 +- .../viewer/graphql/model/domain/GqlvMeta.java | 15 +++--- .../viewer/graphql/model/domain/GqlvProperty.java | 14 ++++-- .../model/domain/GqlvPropertyAutoComplete.java | 15 +++--- .../graphql/model/domain/GqlvPropertyChoices.java | 13 ++--- .../graphql/model/domain/GqlvPropertyGet.java | 5 +- .../graphql/model/domain/GqlvPropertySet.java | 13 ++--- .../graphql/model/domain/GqlvPropertyValidate.java | 9 ++-- .../graphql/model/fetcher/BookmarkedPojo.java | 3 +- .../model/fetcher/BookmarkedPojoFetcher.java | 5 +- .../model/registry/GraphQLTypeRegistry.java | 5 +- .../graphql/model/types/TypeMapperDefault.java | 21 ++++----- ...ayViewerGraphqlTestModuleIntegTestAbstract.java | 1 + .../viewer/test/e2e/Abstract_IntegTest.java | 1 + .../graphql/viewer/test/e2e/Admin_IntegTest.java | 1 + .../viewer/test/e2e/Calculator_IntegTest.java | 1 + .../viewer/test/e2e/DeptHead_IntegTest.java | 5 +- .../graphql/viewer/test/e2e/Staff_IntegTest.java | 5 +- .../test/schema/GqlSchema_print_IntegTest.java | 4 +- .../viewer/test/schema/Schema_IntegTest.java | 1 + .../viewer/auth/UserMementoProviderDefault.java | 12 ++--- ...xecutionStrategyResolvingWithinInteraction.java | 5 +- .../ExecutionGraphQlServiceForCauseway.java | 1 + .../integration/GraphQlSourceForCauseway.java | 7 +-- .../graphql/viewer/toplevel/GqlvTopLevelQuery.java | 11 +++-- 47 files changed, 288 insertions(+), 265 deletions(-) diff --git a/.editorconfig b/.editorconfig index dff57e16f1..5c99ed8623 100644 --- a/.editorconfig +++ b/.editorconfig @@ -112,7 +112,7 @@ ij_java_for_statement_wrap = off ij_java_generate_final_locals = false ij_java_generate_final_parameters = false ij_java_if_brace_force = never -ij_java_imports_layout = java.**,|,$java.**,|,javax.**,|,$javax.**,|,com.**,|,$com.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,org.apache.isis.**,|,$org.apache.isis.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,demoapp.**,|,*,|,$* +ij_java_imports_layout = java.**,|,$java.**,|,javax.**,|,$javax.**,|,com.**,|,$com.**,|,graphql.**,|,$graphql.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,org.apache.isis.**,|,$org.apache.isis.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,demoapp.**,|,*,|,$* ij_java_indent_case_from_switch = true ij_java_insert_inner_class_imports = false ij_java_insert_override_annotation = true diff --git a/viewers/graphql/applib/src/main/java/org/apache/causeway/viewer/graphql/applib/types/TypeMapper.java b/viewers/graphql/applib/src/main/java/org/apache/causeway/viewer/graphql/applib/types/TypeMapper.java index 529d903698..ccea137f8e 100644 --- a/viewers/graphql/applib/src/main/java/org/apache/causeway/viewer/graphql/applib/types/TypeMapper.java +++ b/viewers/graphql/applib/src/main/java/org/apache/causeway/viewer/graphql/applib/types/TypeMapper.java @@ -19,6 +19,11 @@ package org.apache.causeway.viewer.graphql.applib.types; import graphql.ExperimentalApi; +import graphql.schema.GraphQLInputType; +import graphql.schema.GraphQLList; +import graphql.schema.GraphQLOutputType; +import graphql.schema.GraphQLScalarType; + import org.springframework.lang.Nullable; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; @@ -26,11 +31,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; -import graphql.schema.GraphQLScalarType; - /** * 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/context/Context.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/context/Context.java index 787c23eef8..14c4c1089d 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 @@ -20,8 +20,6 @@ package org.apache.causeway.viewer.graphql.model.context; import graphql.schema.GraphQLCodeRegistry; -import lombok.RequiredArgsConstructor; - import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.commons.collections.ImmutableEnumSet; import org.apache.causeway.core.config.CausewayConfiguration; @@ -30,7 +28,6 @@ import org.apache.causeway.core.metamodel.spec.ActionScope; import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; -import graphql.schema.GraphQLCodeRegistry; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor 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 696ff52d68..bc784914d3 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java @@ -18,14 +18,20 @@ */ package org.apache.causeway.viewer.graphql.model.domain; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import static graphql.schema.GraphQLObjectType.newObject; - import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.FieldCoordinates; +import graphql.schema.GraphQLArgument; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; + +import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; +import static graphql.schema.GraphQLObjectType.newObject; + import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.commons.collections.Can; @@ -35,24 +41,12 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter; import org.apache.causeway.core.metamodel.spec.feature.OneToManyActionParameter; import org.apache.causeway.core.metamodel.spec.feature.OneToOneActionParameter; +import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.FieldCoordinates; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLObjectType; import lombok.val; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import static graphql.schema.GraphQLObjectType.newObject; +import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvAction diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java index d03634ed37..81929f6dab 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionInvoke.java @@ -18,6 +18,12 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLList; +import graphql.schema.GraphQLOutputType; +import graphql.schema.GraphQLType; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.springframework.lang.Nullable; @@ -30,19 +36,14 @@ import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; +import org.apache.causeway.viewer.graphql.applib.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.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLList; -import graphql.schema.GraphQLOutputType; -import graphql.schema.GraphQLType; 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 0150138d52..704a05d5f5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java @@ -18,6 +18,11 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.FieldCoordinates; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import static graphql.schema.GraphQLObjectType.newObject; @@ -27,16 +32,12 @@ import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter; +import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.FieldCoordinates; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLObjectType; 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/GqlvActionParamAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java index 7b9e799e9e..94d9164570 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamAutoComplete.java @@ -18,34 +18,35 @@ */ package org.apache.causeway.viewer.graphql.model.domain; + import java.util.Collections; + import java.util.List; + import java.util.stream.Collectors; + + import graphql.schema.DataFetchingEnvironment; + import graphql.schema.GraphQLArgument; + import graphql.schema.GraphQLFieldDefinition; + import graphql.schema.GraphQLList; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import static graphql.schema.GraphQLNonNull.nonNull; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.bookmark.BookmarkService; -import org.apache.causeway.commons.collections.Can; -import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; -import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction; -import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel; -import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; -import org.apache.causeway.viewer.graphql.model.context.Context; -import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; - -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLList; -import lombok.val; -import lombok.extern.log4j.Log4j2; + import static graphql.schema.GraphQLNonNull.nonNull; + + import org.apache.causeway.applib.annotation.Where; + import org.apache.causeway.applib.services.bookmark.BookmarkService; + import org.apache.causeway.commons.collections.Can; + import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; + import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction; + import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel; + import org.apache.causeway.core.metamodel.object.ManagedObject; + import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; + import org.apache.causeway.viewer.graphql.applib.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 lombok.val; + import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamAutoComplete { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java index ff75f64f1d..2170cba2a2 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamChoices.java @@ -18,32 +18,33 @@ */ package org.apache.causeway.viewer.graphql.model.domain; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.bookmark.BookmarkService; -import org.apache.causeway.commons.collections.Can; -import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; -import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction; -import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel; -import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; -import org.apache.causeway.viewer.graphql.model.context.Context; -import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; - -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLList; -import lombok.val; -import lombok.extern.log4j.Log4j2; + import java.util.Collections; + import java.util.List; + import java.util.stream.Collectors; + + import graphql.schema.DataFetchingEnvironment; + import graphql.schema.GraphQLFieldDefinition; + import graphql.schema.GraphQLList; + + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; + + import org.apache.causeway.applib.annotation.Where; + import org.apache.causeway.applib.services.bookmark.BookmarkService; + import org.apache.causeway.commons.collections.Can; + import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; + import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction; + import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel; + import org.apache.causeway.core.metamodel.object.ManagedObject; + import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; + import org.apache.causeway.viewer.graphql.applib.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 lombok.val; + import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamChoices { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java index 69b67e9766..899742a5c3 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDefault.java @@ -18,28 +18,29 @@ */ package org.apache.causeway.viewer.graphql.model.domain; + import java.util.Collections; + + import graphql.schema.DataFetchingEnvironment; + import graphql.schema.GraphQLFieldDefinition; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import java.util.Collections; - -import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.bookmark.BookmarkService; -import org.apache.causeway.commons.collections.Can; -import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction; -import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel; -import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; -import org.apache.causeway.viewer.graphql.model.context.Context; -import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; - -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -import lombok.val; -import lombok.extern.log4j.Log4j2; + import org.apache.causeway.applib.annotation.Where; + import org.apache.causeway.applib.services.bookmark.BookmarkService; + import org.apache.causeway.commons.collections.Can; + import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction; + import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel; + import org.apache.causeway.core.metamodel.object.ManagedObject; + import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; + import org.apache.causeway.viewer.graphql.applib.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 lombok.val; + import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamDefault { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java index ec1989ac29..9d1d3b0497 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamDisabled.java @@ -18,6 +18,9 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.applib.services.bookmark.BookmarkService; @@ -25,15 +28,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.applib.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.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -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/GqlvActionParamHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java index 8fb5d406a3..96b9a6d8ff 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamHidden.java @@ -18,24 +18,25 @@ */ package org.apache.causeway.viewer.graphql.model.domain; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; - -import org.apache.causeway.applib.services.bookmark.BookmarkService; -import org.apache.causeway.commons.collections.Can; -import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; -import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; -import org.apache.causeway.viewer.graphql.model.context.Context; -import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; - -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -import lombok.val; -import lombok.extern.log4j.Log4j2; + import graphql.schema.DataFetchingEnvironment; + import graphql.schema.GraphQLFieldDefinition; + + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; + + import org.apache.causeway.applib.services.bookmark.BookmarkService; + import org.apache.causeway.commons.collections.Can; + import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; + import org.apache.causeway.core.metamodel.object.ManagedObject; + import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; + import org.apache.causeway.viewer.graphql.applib.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 lombok.val; + import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamHidden { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java index 456c0f311c..1366995910 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParamValidate.java @@ -18,6 +18,9 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.applib.services.bookmark.BookmarkService; @@ -25,15 +28,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.applib.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.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -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/GqlvActionParams.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java index e012f44cb6..218f3391bc 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java @@ -18,29 +18,30 @@ */ package org.apache.causeway.viewer.graphql.model.domain; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import static graphql.schema.GraphQLObjectType.newObject; - import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.FieldCoordinates; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; + +import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; +import static graphql.schema.GraphQLObjectType.newObject; + import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter; +import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.FieldCoordinates; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLObjectType; 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 ece66c47df..3153414c8e 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionValidity.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionValidity.java @@ -18,25 +18,26 @@ */ 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 graphql.schema.GraphQLOutputType; + +import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; + import org.apache.causeway.commons.collections.Can; import org.apache.causeway.core.metamodel.consent.Consent; import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter; +import org.apache.causeway.viewer.graphql.applib.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.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -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/GqlvAssociation.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java index 00d0ff7d2a..5d84037e74 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.GraphQLFieldDefinition; + import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; -import graphql.schema.GraphQLFieldDefinition; - public abstract class GqlvAssociation<T extends ObjectAssociation, H extends GqlvAssociation.Holder> extends GqlvMember<T, H> { public GqlvAssociation( diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java index 31164628ea..b36b804e61 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationGet.java @@ -18,6 +18,10 @@ */ 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.object.ManagedObject; @@ -27,9 +31,6 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLOutputType; import lombok.val; public abstract class GqlvAssociationGet<T extends ObjectAssociation> { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java index 8037b30814..f1cb35e937 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java @@ -18,6 +18,10 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.FieldCoordinates; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import static graphql.schema.GraphQLObjectType.newObject; @@ -26,10 +30,6 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher; -import graphql.schema.FieldCoordinates; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLObjectType; - public class GqlvCollection extends GqlvAssociation<OneToManyAssociation, GqlvCollection.Holder> implements GqlvCollectionGet.Holder, diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java index 148ece05f5..2cc7b7f605 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java @@ -18,14 +18,13 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.GraphQLOutputType; + import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import lombok.val; -import graphql.schema.GraphQLOutputType; -import lombok.val; - public class GqlvCollectionGet extends GqlvAssociationGet<OneToManyAssociation> { public GqlvCollectionGet( 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 b64e849471..ca00697ba2 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java @@ -18,15 +18,21 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import graphql.Scalars; +import graphql.schema.FieldCoordinates; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLInputObjectType; +import graphql.schema.GraphQLObjectType; + import static graphql.schema.GraphQLInputObjectField.newInputObjectField; import static graphql.schema.GraphQLInputObjectType.newInputObject; import static graphql.schema.GraphQLNonNull.nonNull; import static graphql.schema.GraphQLObjectType.newObject; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - import org.apache.causeway.core.metamodel.objectmanager.ObjectManager; import org.apache.causeway.core.metamodel.spec.ActionScope; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; @@ -36,20 +42,11 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry; -import graphql.Scalars; -import graphql.schema.FieldCoordinates; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLInputObjectType; -import graphql.schema.GraphQLObjectType; +import static org.apache.causeway.core.config.CausewayConfiguration.Viewer.Graphql.ApiVariant.QUERY_WITH_MUTATIONS_NON_SPEC_COMPLIANT; +import lombok.Getter; import lombok.val; -import static graphql.schema.GraphQLInputObjectField.newInputObjectField; -import static graphql.schema.GraphQLInputObjectType.newInputObject; -import static graphql.schema.GraphQLNonNull.nonNull; -import static graphql.schema.GraphQLObjectType.newObject; -import static org.apache.causeway.core.config.CausewayConfiguration.Viewer.Graphql.ApiVariant.*; - /** * Exposes a domain object (view model or entity) via the GQL viewer. */ diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java index 7a557b35ac..de9d07a760 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java @@ -18,30 +18,27 @@ */ package org.apache.causeway.viewer.graphql.model.domain; -import static graphql.schema.FieldCoordinates.coordinates; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import static graphql.schema.GraphQLObjectType.newObject; - import java.util.LinkedHashMap; import java.util.Map; -import org.apache.causeway.core.metamodel.spec.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.FieldCoordinates; import graphql.schema.GraphQLFieldDefinition; import graphql.schema.GraphQLObjectType; -import lombok.val; - import static graphql.schema.FieldCoordinates.coordinates; import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import static graphql.schema.GraphQLObjectType.newObject; +import org.apache.causeway.core.metamodel.spec.ObjectSpecification; +import org.apache.causeway.core.metamodel.spec.feature.MixedIn; +import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; +import org.apache.causeway.viewer.graphql.model.context.Context; + import static org.apache.causeway.core.config.CausewayConfiguration.Viewer.Graphql.ApiVariant.QUERY_WITH_MUTATIONS_NON_SPEC_COMPLIANT; +import lombok.Getter; +import lombok.val; + /** * Exposes a domain service (view model or entity) via the GQL viewer. */ diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java index 7416f6dfe9..6b0aab0465 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,11 +18,12 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.GraphQLFieldDefinition; + import org.apache.causeway.core.metamodel.spec.feature.ObjectMember; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import graphql.schema.GraphQLFieldDefinition; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; 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 6bfbf97e14..9c0be5b258 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberDisabled.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberDisabled.java @@ -18,6 +18,9 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.applib.annotation.Where; @@ -29,8 +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.DataFetchingEnvironment; -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/GqlvMemberHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHidden.java index 4a965ed5a3..a60a09b057 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHidden.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHidden.java @@ -18,6 +18,9 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; + import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.applib.annotation.Where; @@ -29,8 +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.DataFetchingEnvironment; -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/GqlvMeta.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java index fcf7de1196..c8a6482f79 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java @@ -18,14 +18,19 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import java.util.Objects; +import java.util.Optional; + +import graphql.Scalars; +import graphql.schema.DataFetcher; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; + import static graphql.schema.FieldCoordinates.coordinates; import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import static graphql.schema.GraphQLNonNull.nonNull; import static graphql.schema.GraphQLObjectType.newObject; -import java.util.Objects; -import java.util.Optional; - import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.applib.services.metamodel.BeanSort; @@ -35,10 +40,6 @@ import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry; -import graphql.Scalars; -import graphql.schema.DataFetcher; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLObjectType; import lombok.Getter; import lombok.val; 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 e31790911d..033bfda1e9 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java @@ -18,17 +18,21 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.FieldCoordinates; +import graphql.schema.GraphQLArgument; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; + +import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; +import static graphql.schema.GraphQLObjectType.newObject; + import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; -import graphql.schema.FieldCoordinates; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLObjectType; import lombok.val; public class GqlvProperty diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java index 8d25c2978f..3e45de4c2c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyAutoComplete.java @@ -18,12 +18,17 @@ */ package org.apache.causeway.viewer.graphql.model.domain; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import static graphql.schema.GraphQLNonNull.nonNull; - import java.util.List; import java.util.stream.Collectors; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLArgument; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLList; + +import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; +import static graphql.schema.GraphQLNonNull.nonNull; + import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.viewer.graphql.model.context.Context; @@ -31,10 +36,6 @@ 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 graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLList; import lombok.val; public class GqlvPropertyAutoComplete { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java index 970e582a19..959e66b60b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyChoices.java @@ -18,23 +18,24 @@ */ package org.apache.causeway.viewer.graphql.model.domain; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; - import java.util.List; import java.util.stream.Collectors; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLList; + +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.applib.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.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLList; import lombok.val; public class GqlvPropertyChoices { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java index 72a7bc0d8d..0fd8531258 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyGet.java @@ -18,14 +18,13 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.GraphQLOutputType; + import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import lombok.val; -import graphql.schema.GraphQLOutputType; -import lombok.val; - public class GqlvPropertyGet extends GqlvAssociationGet<OneToOneAssociation> { public GqlvPropertyGet( 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 2ecd60d520..d2659adcd0 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,14 +18,19 @@ */ 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 graphql.schema.GraphQLOutputType; + +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; import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.causeway.viewer.graphql.applib.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; @@ -33,11 +38,7 @@ import org.apache.causeway.viewer.graphql.model.exceptions.InvalidException; 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.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLOutputType; import lombok.val; public class GqlvPropertySet { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java index 78159120e7..4c1ba453cb 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyValidate.java @@ -18,17 +18,20 @@ */ package org.apache.causeway.viewer.graphql.model.domain; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; + +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.applib.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.applib.types.TypeMapper; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLFieldDefinition; import lombok.val; public class GqlvPropertyValidate { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java index 8394cf3041..69f5e54c1f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojo.java @@ -18,10 +18,11 @@ */ package org.apache.causeway.viewer.graphql.model.fetcher; +import graphql.schema.DataFetchingEnvironment; + import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.bookmark.BookmarkService; -import graphql.schema.DataFetchingEnvironment; import lombok.val; public class BookmarkedPojo { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java index 479a12aad5..d2bccfe36d 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/fetcher/BookmarkedPojoFetcher.java @@ -18,10 +18,11 @@ */ package org.apache.causeway.viewer.graphql.model.fetcher; -import org.apache.causeway.applib.services.bookmark.BookmarkService; - import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; + +import org.apache.causeway.applib.services.bookmark.BookmarkService; + import lombok.val; public class BookmarkedPojoFetcher implements DataFetcher<Object> { 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 e431de3250..bca95d0431 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 @@ -22,12 +22,13 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.springframework.stereotype.Component; - import graphql.schema.GraphQLInputObjectType; import graphql.schema.GraphQLNamedType; import graphql.schema.GraphQLObjectType; import graphql.schema.GraphQLType; + +import org.springframework.stereotype.Component; + import lombok.extern.log4j.Log4j2; /** 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 50ef4c6a99..37d448bba5 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,9 +18,6 @@ */ package org.apache.causeway.viewer.graphql.model.types; -import static graphql.schema.GraphQLNonNull.nonNull; -import static graphql.schema.GraphQLTypeReference.typeRef; - import java.math.BigDecimal; import java.math.BigInteger; import java.time.LocalDate; @@ -31,9 +28,15 @@ import java.util.Map; import javax.inject.Inject; import javax.ws.rs.NotSupportedException; -import org.apache.causeway.core.config.CausewayConfiguration; +import graphql.Scalars; +import graphql.schema.GraphQLInputType; +import graphql.schema.GraphQLList; +import graphql.schema.GraphQLOutputType; +import graphql.schema.GraphQLScalarType; +import graphql.schema.GraphQLTypeReference; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; +import static graphql.schema.GraphQLNonNull.nonNull; +import static graphql.schema.GraphQLTypeReference.typeRef; import org.joda.time.DateTime; @@ -43,18 +46,14 @@ import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; import org.apache.causeway.commons.internal.collections._Maps; +import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.core.metamodel.spec.feature.OneToManyActionParameter; import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.causeway.core.metamodel.spec.feature.OneToOneFeature; +import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; 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.GraphQLScalarType; -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/CausewayViewerGraphqlTestModuleIntegTestAbstract.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java index a726de8f3b..9f9fb857b3 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java @@ -39,6 +39,7 @@ import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestMethodOrder; + import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureHttpGraphQlTester; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java index 0971bed8a9..ec9c934083 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Abstract_IntegTest.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; + import org.springframework.core.io.ClassPathResource; import org.springframework.transaction.annotation.Propagation; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java index 833b5f1b1d..61c9f41587 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Admin_IntegTest.java @@ -22,6 +22,7 @@ import org.approvaltests.Approvals; import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; import org.junit.jupiter.api.Test; + import org.springframework.test.context.ActiveProfiles; import lombok.val; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java index e5d18f81d5..d3c5ee98a3 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Calculator_IntegTest.java @@ -22,6 +22,7 @@ import org.approvaltests.Approvals; import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; import org.junit.jupiter.api.Test; + import org.springframework.test.context.ActiveProfiles; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java index 63264d1e24..4b9019d10c 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/DeptHead_IntegTest.java @@ -22,11 +22,12 @@ import org.approvaltests.Approvals; import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; import org.junit.jupiter.api.Test; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.transaction.annotation.Propagation; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.transaction.annotation.Propagation; + import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.DeptHead; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java index ff57d67c18..0d7ac838aa 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Staff_IntegTest.java @@ -24,12 +24,13 @@ import org.approvaltests.Approvals; import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; import org.junit.jupiter.api.Test; -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.commons.internal.collections._Maps; import org.apache.causeway.viewer.graphql.viewer.test.domain.dept.Department; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java index 05f85f69f1..b34f139855 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java @@ -28,6 +28,7 @@ import javax.inject.Inject; import org.approvaltests.core.Options; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.transaction.annotation.Transactional; import org.apache.causeway.commons.io.TextUtils; @@ -38,9 +39,10 @@ import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestM import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull; -import graphql.schema.idl.SchemaPrinter; import lombok.val; +import graphql.schema.idl.SchemaPrinter; + @Transactional public class GqlSchema_print_IntegTest extends CausewayViewerGraphqlTestModuleIntegTestAbstract { diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java index 899059f676..70cee3784e 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/Schema_IntegTest.java @@ -23,6 +23,7 @@ import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; + import org.springframework.test.context.ActiveProfiles; import org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract; 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 86ac84b92a..b6356bf7d0 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,22 +20,22 @@ package org.apache.causeway.viewer.graphql.viewer.auth; import javax.inject.Inject; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import org.apache.causeway.applib.services.user.RoleMemento; import org.apache.causeway.applib.services.user.UserMemento; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.viewer.graphql.applib.auth.UserMementoProvider; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; +import lombok.RequiredArgsConstructor; +import lombok.val; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionStrategyParameters; -import lombok.RequiredArgsConstructor; -import lombok.val; - @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class UserMementoProviderDefault implements UserMementoProvider { 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 87d0308a8b..730428732a 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 @@ -23,10 +23,11 @@ import java.util.concurrent.CompletableFuture; import org.springframework.stereotype.Service; import org.apache.causeway.applib.services.iactnlayer.InteractionContext; -import org.apache.causeway.applib.services.user.UserMemento; - +import org.apache.causeway.applib.services.iactnlayer.InteractionService; import org.apache.causeway.viewer.graphql.applib.auth.UserMementoProvider; +import lombok.val; + import graphql.execution.AsyncExecutionStrategy; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionStrategyParameters; diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java index 85e06ba3ee..3b8324199d 100644 --- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java +++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/ExecutionGraphQlServiceForCauseway.java @@ -29,6 +29,7 @@ import org.springframework.graphql.execution.GraphQlSource; import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; + import reactor.core.publisher.Mono; /** 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 0e88a260ff..e0403c37e3 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 @@ -37,13 +37,16 @@ import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode; import org.apache.causeway.core.metamodel.objectmanager.ObjectManager; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; +import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainObject; import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainService; import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry; -import org.apache.causeway.viewer.graphql.applib.types.TypeMapper; import org.apache.causeway.viewer.graphql.viewer.toplevel.GqlvTopLevelQuery; +import lombok.RequiredArgsConstructor; +import lombok.val; + import graphql.GraphQL; import graphql.execution.DataFetcherExceptionHandler; import graphql.execution.DataFetcherExceptionHandlerParameters; @@ -51,8 +54,6 @@ import graphql.execution.DataFetcherExceptionHandlerResult; import graphql.schema.GraphQLCodeRegistry; import graphql.schema.GraphQLSchema; import graphql.schema.GraphQLType; -import lombok.RequiredArgsConstructor; -import lombok.val; @Service() @RequiredArgsConstructor(onConstructor_ = {@Inject}) diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java index d382950a08..36b6f983dc 100644 --- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java +++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java @@ -1,19 +1,20 @@ package org.apache.causeway.viewer.graphql.viewer.toplevel; -import static graphql.schema.FieldCoordinates.coordinates; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; -import static graphql.schema.GraphQLObjectType.newObject; - import org.apache.causeway.applib.services.registry.ServiceRegistry; import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainService; +import lombok.Getter; + import graphql.Scalars; import graphql.schema.DataFetcher; import graphql.schema.FieldCoordinates; import graphql.schema.GraphQLCodeRegistry; import graphql.schema.GraphQLFieldDefinition; import graphql.schema.GraphQLObjectType; -import lombok.Getter; + +import static graphql.schema.FieldCoordinates.coordinates; +import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; +import static graphql.schema.GraphQLObjectType.newObject; public class GqlvTopLevelQuery {
