From d23f662a2bb2fd34340803f7263ce211c4e62eb9 Mon Sep 17 00:00:00 2001 From: AndreasVolkmann Date: Thu, 7 Feb 2019 20:11:44 +0100 Subject: [PATCH 01/21] fix windows line endings not being ignored --- .../pgutkowski/kgraphql/request/RequestPreProcessing.kt | 2 +- .../kgraphql/request/RequestTokenizationTest.kt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestPreProcessing.kt b/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestPreProcessing.kt index 6cf135c2..a89a685f 100644 --- a/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestPreProcessing.kt +++ b/src/main/kotlin/com/github/pgutkowski/kgraphql/request/RequestPreProcessing.kt @@ -5,7 +5,7 @@ import com.github.pgutkowski.kgraphql.not val OPERANDS = "{}():[]" -val IGNORED_CHARACTERS = "\n\t, " +val IGNORED_CHARACTERS = "\n\t\r, " val DELIMITERS = OPERANDS + IGNORED_CHARACTERS diff --git a/src/test/kotlin/com/github/pgutkowski/kgraphql/request/RequestTokenizationTest.kt b/src/test/kotlin/com/github/pgutkowski/kgraphql/request/RequestTokenizationTest.kt index fd8063fc..e29ca2ad 100644 --- a/src/test/kotlin/com/github/pgutkowski/kgraphql/request/RequestTokenizationTest.kt +++ b/src/test/kotlin/com/github/pgutkowski/kgraphql/request/RequestTokenizationTest.kt @@ -58,4 +58,12 @@ class RequestTokenizationTest { expected = listOf("{", "hello", "(", "name", ":", "\"Ted\\\" Mosby\"", ")", "}") ) } + + @Test + fun `tokenize input with new lines`() { + testTokenization( + input = "{lists{\r\ntotalCount\r\nnodes{\r\ntitle\r\n }\r\n}\r\n}", + expected = listOf("{", "lists", "{", "totalCount", "nodes", "{", "title", "}", "}", "}") + ) + } } \ No newline at end of file From 71392108cfc740e4959657b575cd8ee3f5ff7442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3gvan=20Olsen?= Date: Mon, 29 Apr 2019 14:24:54 +0100 Subject: [PATCH 02/21] Created gitlab-ci configuration --- .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..ccac04ad --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +image: gradle:alpine + +stages: + - test + - publish + + +variables: + GRADLE_OPTS: "-Dorg.gradle.daemon=false" + +before_script: + - export GRADLE_USER_HOME=`pwd`/.gradle + +build: + stage: test + cache: + paths: + - build + - .gradle + script: + - gradle assemble + +test: + stage: test + cache: + paths: + - build + - .gradle + script: + - gradle jacocoTestReport coveralls From 42c73a5c36561df5f64ddfe983b917fa36af220c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3gvan=20Olsen?= Date: Mon, 29 Apr 2019 15:11:55 +0100 Subject: [PATCH 03/21] Renamed to apurebase --- .gitignore | 132 +++++++++++++++++- .gitlab-ci.yml | 11 ++ .idea/runConfigurations/Run_Tests.xml | 23 +++ .travis.yml | 10 -- README.MD | 33 ++--- build.gradle | 42 ++++-- .../com/apurebase/kgraphql/BenchmarkSchema.kt | 50 +++++++ .../kgraphql/FunctionExecutionBenchmark.kt | 4 +- .../kgraphql/JVisualVMSampler.kt | 4 +- .../kgraphql/ParallelExecutionBenchmark.kt | 4 +- .../kgraphql/RequestCachingBenchmark.kt | 6 +- .../SimpleExecutionOverheadBenchmark.kt | 12 +- .../pgutkowski/kgraphql/BenchmarkSchema.kt | 36 ----- .../kgraphql/Context.kt | 4 +- .../kgraphql/ContextBuilder.kt | 2 +- .../kgraphql/ExecutionException.kt | 2 +- .../kgraphql/Extensions.kt | 2 +- .../kgraphql/KGraphQL.kt | 4 +- .../kgraphql/RequestException.kt | 2 +- .../kgraphql/ValidationException.kt | 2 +- .../configuration/SchemaConfiguration.kt | 2 +- .../kgraphql/request/Arguments.kt | 2 +- .../kgraphql/request/CachingDocumentParser.kt | 2 +- .../kgraphql/request/Document.kt | 6 +- .../kgraphql/request/DocumentParser.kt | 16 +-- .../kgraphql/request/Operation.kt | 4 +- .../kgraphql/request/OperationVariable.kt | 2 +- .../kgraphql/request/ParsingContext.kt | 4 +- .../kgraphql/request/RequestPreProcessing.kt | 6 +- .../kgraphql/request/RequestValidation.kt | 4 +- .../kgraphql/request/TypeReference.kt | 2 +- .../kgraphql/request/Variables.kt | 12 +- .../kgraphql/request/VariablesJson.kt | 8 +- .../request/graph/DirectiveInvocation.kt | 6 + .../kgraphql/request/graph/Fragment.kt | 2 +- .../kgraphql/request/graph/SelectionNode.kt | 4 +- .../kgraphql/request/graph/SelectionTree.kt | 6 +- .../kgraphql/schema/DefaultSchema.kt | 30 ++-- .../kgraphql/schema/Schema.kt | 6 +- .../kgraphql/schema/SchemaException.kt | 2 +- .../kgraphql/schema/builtin/BUILT_IN_TYPE.kt | 16 +-- .../kgraphql/schema/directive/Directive.kt | 16 +-- .../schema/directive/DirectiveExecution.kt | 6 + .../schema/directive/DirectiveLocation.kt | 2 +- .../schema/directive/DirectiveResult.kt | 2 +- .../kgraphql/schema/dsl/BooleanScalarDSL.kt | 8 +- .../kgraphql/schema/dsl/DepreciableItemDSL.kt | 2 +- .../kgraphql/schema/dsl/DoubleScalarDSL.kt | 8 +- .../kgraphql/schema/dsl/EnumDSL.kt | 4 +- .../kgraphql/schema/dsl/EnumValueDSL.kt | 2 +- .../kgraphql/schema/dsl/InputTypeDSL.kt | 4 +- .../kgraphql/schema/dsl/InputValueDSL.kt | 4 +- .../kgraphql/schema/dsl/InputValuesDSL.kt | 2 +- .../kgraphql/schema/dsl/IntScalarDSL.kt | 8 +- .../kgraphql/schema/dsl/ItemDSL.kt | 2 +- .../kgraphql/schema/dsl/KotlinPropertyDSL.kt | 6 +- .../schema/dsl/LimitedAccessItemDSL.kt | 4 +- .../kgraphql/schema/dsl/LongScalarDSL.kt | 8 +- .../kgraphql/schema/dsl/PropertyDSL.kt | 10 +- .../kgraphql/schema/dsl/QueryOrMutationDSL.kt | 12 +- .../kgraphql/schema/dsl/ResolverDSL.kt | 4 +- .../kgraphql/schema/dsl/ScalarDSL.kt | 6 +- .../kgraphql/schema/dsl/SchemaBuilder.kt | 14 +- .../schema/dsl/SchemaBuilderMarker.kt | 4 + .../schema/dsl/SchemaConfigurationDSL.kt | 4 +- .../kgraphql/schema/dsl/StringScalarDSL.kt | 8 +- .../kgraphql/schema/dsl/TypeDSL.kt | 16 +-- .../apurebase/kgraphql/schema/dsl/TypeID.kt | 4 + .../kgraphql/schema/dsl/UnionPropertyDSL.kt | 12 +- .../kgraphql/schema/dsl/UnionTypeDSL.kt | 2 +- .../schema/execution/ArgumentTransformer.kt | 18 +-- .../schema/execution/ArgumentsHandler.kt | 18 +-- .../kgraphql/schema/execution/Execution.kt | 12 +- .../schema/execution/ExecutionPlan.kt | 2 +- .../execution/ParallelRequestExecutor.kt | 30 ++-- .../schema/execution/RequestExecutor.kt | 6 +- .../schema/execution/TypeCondition.kt | 8 ++ .../schema/introspection/NotIntrospected.kt | 4 + .../schema/introspection/SchemaProxy.kt | 8 +- .../kgraphql/schema/introspection/TypeKind.kt | 2 +- .../schema/introspection/__Described.kt | 2 +- .../schema/introspection/__Directive.kt | 11 ++ .../schema/introspection/__EnumValue.kt | 6 + .../kgraphql/schema/introspection/__Field.kt | 11 ++ .../schema/introspection/__InputValue.kt | 2 +- .../kgraphql/schema/introspection/__Schema.kt | 2 +- .../kgraphql/schema/introspection/__Type.kt | 2 +- .../kgraphql/schema/model/BaseOperationDef.kt | 4 +- .../kgraphql/schema/model/Definition.kt | 2 +- .../kgraphql/schema/model/Deprecation.kt | 2 +- .../kgraphql/schema/model/Depreciable.kt | 2 +- .../kgraphql/schema/model/DescribedDef.kt | 2 +- .../kgraphql/schema/model/EnumValueDef.kt | 4 +- .../kgraphql/schema/model/FunctionWrapper.kt | 6 +- .../kgraphql/schema/model/InputValueDef.kt | 2 +- .../schema/model/MutableSchemaDefinition.kt | 28 ++-- .../kgraphql/schema/model/MutationDef.kt | 4 +- .../kgraphql/schema/model/OperationDef.kt | 2 +- .../kgraphql/schema/model/PropertyDef.kt | 4 +- .../kgraphql/schema/model/QueryDef.kt | 4 +- .../kgraphql/schema/model/SchemaDefinition.kt | 4 +- .../kgraphql/schema/model/Transformation.kt | 2 +- .../kgraphql/schema/model/TypeDef.kt | 6 +- .../schema/scalar/BooleanScalarCoercion.kt | 2 +- .../kgraphql/schema/scalar/Coercion.kt | 20 +-- .../schema/scalar/DoubleScalarCoercion.kt | 2 +- .../schema/scalar/IntScalarCoercion.kt | 2 +- .../schema/scalar/LongScalarCoercion.kt | 2 +- .../kgraphql/schema/scalar/ScalarCoercion.kt | 2 +- .../schema/scalar/StringScalarCoercion.kt | 2 +- .../kgraphql/schema/structure2/EnumValue.kt | 6 +- .../kgraphql/schema/structure2/Field.kt | 22 +-- .../kgraphql/schema/structure2/InputValue.kt | 6 +- .../schema/structure2/LookupSchema.kt | 10 +- .../schema/structure2/RequestInterpreter.kt | 26 ++-- .../schema/structure2/SchemaCompilation.kt | 42 +++--- .../kgraphql/schema/structure2/SchemaModel.kt | 10 +- .../kgraphql/schema/structure2/Type.kt | 20 +-- .../kgraphql/schema/structure2/TypeProxy.kt | 12 +- .../kgraphql/schema/structure2/Validation.kt | 16 +-- .../request/graph/DirectiveInvocation.kt | 6 - .../schema/directive/DirectiveExecution.kt | 6 - .../schema/dsl/SchemaBuilderMarker.kt | 4 - .../pgutkowski/kgraphql/schema/dsl/TypeID.kt | 4 - .../schema/execution/TypeCondition.kt | 8 -- .../schema/introspection/NotIntrospected.kt | 4 - .../schema/introspection/__Directive.kt | 11 -- .../schema/introspection/__EnumValue.kt | 6 - .../kgraphql/schema/introspection/__Field.kt | 11 -- .../kgraphql/Specification.kt | 2 +- .../kgraphql/TestClasses.kt | 4 +- .../kgraphql/TestUtils.kt | 8 +- .../kgraphql/access/AccessRulesTest.kt | 12 +- .../kgraphql/demo/HelloWorld.kt | 4 +- .../kgraphql/demo/ServerDemo.kt | 6 +- .../kgraphql/demo/StarWarsSchema.kt | 4 +- .../kgraphql/integration/BaseSchemaTest.kt | 28 ++-- .../kgraphql/integration/EnumTest.kt | 6 +- .../kgraphql/integration/LongScalarTest.kt | 12 +- .../kgraphql/integration/MutationTest.kt | 12 +- .../integration/ParallelExecutionTest.kt | 10 +- .../kgraphql/integration/QueryTest.kt | 12 +- .../kgraphql/request/DocumentParserTest.kt | 22 +-- .../request/RequestTokenizationTest.kt | 2 +- .../kgraphql/schema/SchemaBuilderTest.kt | 32 ++--- .../kgraphql/schema/SchemaInheritanceTest.kt | 10 +- .../kgraphql/server/HttpRequestHandler.kt | 4 +- .../kgraphql/server/NettyServer.kt | 6 +- .../server/NettyServerPipelineConfig.kt | 2 +- .../introspection/ContextSpecificationTest.kt | 10 +- .../DeprecationSpecificationTest.kt | 8 +- .../DocumentationSpecificationTest.kt | 8 +- .../IntrospectionSpecificationTest.kt | 20 +-- .../language/ArgumentsSpecificationTest.kt | 12 +- .../language/FieldAliasSpecificationTest.kt | 12 +- .../language/FieldsSpecificationTest.kt | 12 +- .../language/FragmentsSpecificationTest.kt | 28 ++-- .../language/InputValuesSpecificationTest.kt | 16 +-- .../language/OperationsSpecificationTest.kt | 10 +- .../QueryDocumentSpecificationTest.kt | 18 +-- .../SelectionSetsSpecificationTest.kt | 12 +- .../language/SourceTextSpecificationTest.kt | 20 +-- .../language/VariablesSpecificationTest.kt | 12 +- .../typesystem/DirectivesSpecificationTest.kt | 8 +- .../typesystem/EnumsSpecificationTest.kt | 16 +-- .../InputObjectsSpecificationTest.kt | 8 +- .../typesystem/InterfacesSpecificationTest.kt | 14 +- .../typesystem/ListsSpecificationTest.kt | 14 +- .../typesystem/NonNullSpecificationTest.kt | 14 +- .../typesystem/ObjectsSpecificationTest.kt | 12 +- .../typesystem/ScalarsSpecificationTest.kt | 18 +-- .../typesystem/TypeSystemSpecificationTest.kt | 10 +- .../typesystem/UnionsSpecificationTest.kt | 16 +-- 173 files changed, 948 insertions(+), 773 deletions(-) create mode 100644 .idea/runConfigurations/Run_Tests.xml delete mode 100644 .travis.yml create mode 100644 src/jmh/kotlin/com/apurebase/kgraphql/BenchmarkSchema.kt rename src/jmh/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/FunctionExecutionBenchmark.kt (94%) rename src/jmh/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/JVisualVMSampler.kt (74%) rename src/jmh/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/ParallelExecutionBenchmark.kt (94%) rename src/jmh/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/RequestCachingBenchmark.kt (87%) rename src/jmh/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/SimpleExecutionOverheadBenchmark.kt (83%) delete mode 100644 src/jmh/kotlin/com/github/pgutkowski/kgraphql/BenchmarkSchema.kt rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/Context.kt (73%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/ContextBuilder.kt (95%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/ExecutionException.kt (71%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/Extensions.kt (96%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/KGraphQL.kt (57%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/RequestException.kt (71%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/ValidationException.kt (72%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/configuration/SchemaConfiguration.kt (89%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/Arguments.kt (87%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/CachingDocumentParser.kt (95%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/Document.kt (90%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/DocumentParser.kt (95%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/Operation.kt (80%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/OperationVariable.kt (83%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/ParsingContext.kt (93%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/RequestPreProcessing.kt (98%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/RequestValidation.kt (88%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/TypeReference.kt (93%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/Variables.kt (88%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/VariablesJson.kt (89%) create mode 100644 src/main/kotlin/com/apurebase/kgraphql/request/graph/DirectiveInvocation.kt rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/graph/Fragment.kt (95%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/graph/SelectionNode.kt (94%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/graph/SelectionTree.kt (92%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/DefaultSchema.kt (77%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/Schema.kt (60%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/SchemaException.kt (67%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/builtin/BUILT_IN_TYPE.kt (90%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/directive/Directive.kt (76%) create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/directive/DirectiveExecution.kt rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/directive/DirectiveLocation.kt (73%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/directive/DirectiveResult.kt (79%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/BooleanScalarDSL.kt (72%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/DepreciableItemDSL.kt (83%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/DoubleScalarDSL.kt (72%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/EnumDSL.kt (83%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/EnumValueDSL.kt (74%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/InputTypeDSL.kt (67%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/InputValueDSL.kt (82%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/InputValuesDSL.kt (89%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/IntScalarDSL.kt (72%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/ItemDSL.kt (62%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/KotlinPropertyDSL.kt (85%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/LimitedAccessItemDSL.kt (73%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/LongScalarDSL.kt (72%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/PropertyDSL.kt (87%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/QueryOrMutationDSL.kt (90%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/ResolverDSL.kt (77%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/ScalarDSL.kt (81%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/SchemaBuilder.kt (94%) create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilderMarker.kt rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/SchemaConfigurationDSL.kt (90%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/StringScalarDSL.kt (72%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/TypeDSL.kt (88%) create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeID.kt rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/UnionPropertyDSL.kt (85%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/dsl/UnionTypeDSL.kt (87%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/execution/ArgumentTransformer.kt (81%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/execution/ArgumentsHandler.kt (83%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/execution/Execution.kt (81%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/execution/ExecutionPlan.kt (65%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/execution/ParallelRequestExecutor.kt (93%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/execution/RequestExecutor.kt (58%) create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/execution/TypeCondition.kt create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/introspection/NotIntrospected.kt rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/introspection/SchemaProxy.kt (86%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/introspection/TypeKind.kt (71%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/introspection/__Described.kt (57%) create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Directive.kt create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__EnumValue.kt create mode 100644 src/main/kotlin/com/apurebase/kgraphql/schema/introspection/__Field.kt rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/introspection/__InputValue.kt (61%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/introspection/__Schema.kt (79%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/introspection/__Type.kt (94%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/BaseOperationDef.kt (75%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/Definition.kt (74%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/Deprecation.kt (55%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/Depreciable.kt (64%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/DescribedDef.kt (52%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/EnumValueDef.kt (74%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/FunctionWrapper.kt (98%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/InputValueDef.kt (86%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/MutableSchemaDefinition.kt (89%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/MutationDef.kt (81%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/OperationDef.kt (78%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/PropertyDef.kt (94%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/QueryDef.kt (82%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/SchemaDefinition.kt (85%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/Transformation.kt (79%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/model/TypeDef.kt (92%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/scalar/BooleanScalarCoercion.kt (55%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/scalar/Coercion.kt (79%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/scalar/DoubleScalarCoercion.kt (54%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/scalar/IntScalarCoercion.kt (52%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/scalar/LongScalarCoercion.kt (52%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/scalar/ScalarCoercion.kt (88%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/scalar/StringScalarCoercion.kt (54%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/EnumValue.kt (65%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/Field.kt (79%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/InputValue.kt (68%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/LookupSchema.kt (86%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/RequestInterpreter.kt (88%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/SchemaCompilation.kt (90%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/SchemaModel.kt (81%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/Type.kt (93%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/TypeProxy.kt (70%) rename src/main/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/structure2/Validation.kt (85%) delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/request/graph/DirectiveInvocation.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/directive/DirectiveExecution.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/SchemaBuilderMarker.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/dsl/TypeID.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/execution/TypeCondition.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/NotIntrospected.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Directive.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__EnumValue.kt delete mode 100644 src/main/kotlin/com/github/pgutkowski/kgraphql/schema/introspection/__Field.kt rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/Specification.kt (76%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/TestClasses.kt (86%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/TestUtils.kt (93%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/access/AccessRulesTest.kt (81%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/demo/HelloWorld.kt (75%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/demo/ServerDemo.kt (55%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/demo/StarWarsSchema.kt (95%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/integration/BaseSchemaTest.kt (92%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/integration/EnumTest.kt (83%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/integration/LongScalarTest.kt (81%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/integration/MutationTest.kt (89%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/integration/ParallelExecutionTest.kt (89%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/integration/QueryTest.kt (95%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/DocumentParserTest.kt (92%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/request/RequestTokenizationTest.kt (97%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/SchemaBuilderTest.kt (95%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/schema/SchemaInheritanceTest.kt (80%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/server/HttpRequestHandler.kt (96%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/server/NettyServer.kt (89%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/server/NettyServerPipelineConfig.kt (94%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/introspection/ContextSpecificationTest.kt (80%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/introspection/DeprecationSpecificationTest.kt (95%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/introspection/DocumentationSpecificationTest.kt (95%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/introspection/IntrospectionSpecificationTest.kt (95%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/ArgumentsSpecificationTest.kt (82%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/FieldAliasSpecificationTest.kt (78%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/FieldsSpecificationTest.kt (70%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/FragmentsSpecificationTest.kt (88%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/InputValuesSpecificationTest.kt (94%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/OperationsSpecificationTest.kt (81%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/QueryDocumentSpecificationTest.kt (74%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/SelectionSetsSpecificationTest.kt (79%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/SourceTextSpecificationTest.kt (86%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/language/VariablesSpecificationTest.kt (91%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/DirectivesSpecificationTest.kt (88%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/EnumsSpecificationTest.kt (74%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/InputObjectsSpecificationTest.kt (91%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/InterfacesSpecificationTest.kt (77%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/ListsSpecificationTest.kt (92%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/NonNullSpecificationTest.kt (82%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/ObjectsSpecificationTest.kt (96%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/ScalarsSpecificationTest.kt (95%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/TypeSystemSpecificationTest.kt (71%) rename src/test/kotlin/com/{github/pgutkowski => apurebase}/kgraphql/specification/typesystem/UnionsSpecificationTest.kt (89%) diff --git a/.gitignore b/.gitignore index 880659e5..070b9b13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,130 @@ -build +.idea/.name +.idea/vcs.xml + +# Created by https://www.gitignore.io/api/java,gradle,intellij+iml +# Edit at https://www.gitignore.io/?templates=java,gradle,intellij+iml + +### Intellij+iml ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +# JetBrains templates +**___jb_tmp___ + +### Intellij+iml Patch ### +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Gradle ### .gradle -.idea -/out \ No newline at end of file +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +# End of https://www.gitignore.io/api/java,gradle,intellij+iml \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccac04ad..eeb36e0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,3 +28,14 @@ test: - .gradle script: - gradle jacocoTestReport coveralls + +bintray:publish: + stage: publish + cache: + paths: + - build + - .gradle + script: + - ./gradlew bintrayUpload + only: + - tags diff --git a/.idea/runConfigurations/Run_Tests.xml b/.idea/runConfigurations/Run_Tests.xml new file mode 100644 index 00000000..301bfc22 --- /dev/null +++ b/.idea/runConfigurations/Run_Tests.xml @@ -0,0 +1,23 @@ + + + + + +