Skip to content

Commit af7eea0

Browse files
smyrickbrennantaylor
smyrick
authored and
brennantaylor
committed
refactor: move top level packages (#112)
* refactor: move top level packages Now the top level packages are all the public parts of the library and everything under is internal * refactor: move directive helper
1 parent c584539 commit af7eea0

File tree

66 files changed

+192
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+192
-195
lines changed

‎example/src/main/kotlin/com.expedia.graphql.sample/Application.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.expedia.graphql.sample
22

3+
import com.expedia.graphql.SchemaGeneratorConfig
34
import com.expedia.graphql.TopLevelObjectDef
5+
import com.expedia.graphql.DirectiveWiringHelper
46
import com.expedia.graphql.sample.context.MyGraphQLContextBuilder
57
import com.expedia.graphql.sample.dataFetchers.SpringDataFetcherFactory
68
import com.expedia.graphql.sample.directives.DirectiveWiringFactory
@@ -9,8 +11,6 @@ import com.expedia.graphql.sample.exceptions.CustomDataFetcherExceptionHandler
911
import com.expedia.graphql.sample.extension.CustomSchemaGeneratorHooks
1012
import com.expedia.graphql.sample.mutation.Mutation
1113
import com.expedia.graphql.sample.query.Query
12-
import com.expedia.graphql.schema.SchemaGeneratorConfig
13-
import com.expedia.graphql.schema.generator.directive.DirectiveWiringHelper
1414
import com.expedia.graphql.toSchema
1515
import com.fasterxml.jackson.module.kotlin.KotlinModule
1616
import graphql.execution.AsyncExecutionStrategy
@@ -43,9 +43,9 @@ class Application {
4343

4444
@Bean
4545
fun schemaConfig(dataFetcherFactory: SpringDataFetcherFactory, validator: Validator, wiringFactory: DirectiveWiringFactory): SchemaGeneratorConfig = SchemaGeneratorConfig(
46-
supportedPackages = listOf("com.expedia"),
47-
hooks = CustomSchemaGeneratorHooks(validator, DirectiveWiringHelper(wiringFactory, mapOf("lowercase" to LowercaseDirectiveWiring()))),
48-
dataFetcherFactory = dataFetcherFactory
46+
supportedPackages = listOf("com.expedia"),
47+
hooks = CustomSchemaGeneratorHooks(validator, DirectiveWiringHelper(wiringFactory, mapOf("lowercase" to LowercaseDirectiveWiring()))),
48+
dataFetcherFactory = dataFetcherFactory
4949
)
5050

5151
@Bean
@@ -116,4 +116,4 @@ class Application {
116116

117117
fun main(args: Array<String>) {
118118
runApplication<Application>(*args)
119-
}
119+
}

‎example/src/main/kotlin/com.expedia.graphql.sample/extension/CustomSchemaGeneratorHooks.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.expedia.graphql.sample.extension
22

3+
import com.expedia.graphql.DirectiveWiringHelper
4+
import com.expedia.graphql.hooks.DataFetcherExecutionPredicate
5+
import com.expedia.graphql.hooks.SchemaGeneratorHooks
36
import com.expedia.graphql.sample.validation.DataFetcherExecutionValidator
4-
import com.expedia.graphql.schema.generator.directive.DirectiveWiringHelper
5-
import com.expedia.graphql.schema.hooks.DataFetcherExecutionPredicate
6-
import com.expedia.graphql.schema.hooks.SchemaGeneratorHooks
77
import graphql.language.StringValue
88
import graphql.schema.Coercing
99
import graphql.schema.GraphQLScalarType

‎example/src/main/kotlin/com.expedia.graphql.sample/validation/DataFetcherExecutionValidator.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.expedia.graphql.sample.validation
22

33
import com.expedia.graphql.sample.exceptions.ValidationException
44
import com.expedia.graphql.sample.exceptions.asConstraintError
5-
import com.expedia.graphql.schema.Parameter
6-
import com.expedia.graphql.schema.hooks.DataFetcherExecutionPredicate
5+
import com.expedia.graphql.Parameter
6+
import com.expedia.graphql.hooks.DataFetcherExecutionPredicate
77
import graphql.schema.DataFetchingEnvironment
88
import javax.validation.ConstraintViolation
99
import javax.validation.Valid

src/main/kotlin/com/expedia/graphql/schema/generator/directive/DirectiveWiringHelper.kt renamed to src/main/kotlin/com/expedia/graphql/DirectiveWiringHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.expedia.graphql.schema.generator.directive
1+
package com.expedia.graphql
22

33
import graphql.Assert.assertNotNull
44
import graphql.schema.GraphQLArgument

src/main/kotlin/com/expedia/graphql/schema/KotlinDataFetcher.kt renamed to src/main/kotlin/com/expedia/graphql/KotlinDataFetcher.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.expedia.graphql.schema
1+
package com.expedia.graphql
22

33
import com.expedia.graphql.annotations.GraphQLContext
4-
import com.expedia.graphql.schema.hooks.DataFetcherExecutionPredicate
4+
import com.expedia.graphql.hooks.DataFetcherExecutionPredicate
55
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
66
import graphql.schema.DataFetcher
77
import graphql.schema.DataFetchingEnvironment

src/main/kotlin/com/expedia/graphql/schema/SchemaGeneratorConfig.kt renamed to src/main/kotlin/com/expedia/graphql/SchemaGeneratorConfig.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.expedia.graphql.schema
1+
package com.expedia.graphql
22

3-
import com.expedia.graphql.schema.hooks.NoopSchemaGeneratorHooks
4-
import com.expedia.graphql.schema.hooks.SchemaGeneratorHooks
3+
import com.expedia.graphql.hooks.NoopSchemaGeneratorHooks
4+
import com.expedia.graphql.hooks.SchemaGeneratorHooks
55
import graphql.schema.DataFetcherFactory
66

77
/**

src/main/kotlin/com/expedia/graphql/schema/generator/SchemaGenerator.kt renamed to src/main/kotlin/com/expedia/graphql/generator/SchemaGenerator.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package com.expedia.graphql.schema.generator
1+
package com.expedia.graphql.generator
22

3+
import com.expedia.graphql.SchemaGeneratorConfig
34
import com.expedia.graphql.TopLevelObjectDef
4-
import com.expedia.graphql.schema.SchemaGeneratorConfig
5-
import com.expedia.graphql.schema.extensions.getValidFunctions
6-
import com.expedia.graphql.schema.generator.state.SchemaGeneratorState
7-
import com.expedia.graphql.schema.generator.types.EnumTypeBuilder
8-
import com.expedia.graphql.schema.generator.types.FunctionTypeBuilder
9-
import com.expedia.graphql.schema.generator.types.InputObjectTypeBuilder
10-
import com.expedia.graphql.schema.generator.types.InterfaceTypeBuilder
11-
import com.expedia.graphql.schema.generator.types.ListTypeBuilder
12-
import com.expedia.graphql.schema.generator.types.ObjectTypeBuilder
13-
import com.expedia.graphql.schema.generator.types.PropertyTypeBuilder
14-
import com.expedia.graphql.schema.generator.types.ScalarTypeBuilder
15-
import com.expedia.graphql.schema.generator.types.UnionTypeBuilder
5+
import com.expedia.graphql.generator.extensions.getValidFunctions
6+
import com.expedia.graphql.generator.state.SchemaGeneratorState
7+
import com.expedia.graphql.generator.types.EnumTypeBuilder
8+
import com.expedia.graphql.generator.types.FunctionTypeBuilder
9+
import com.expedia.graphql.generator.types.InputObjectTypeBuilder
10+
import com.expedia.graphql.generator.types.InterfaceTypeBuilder
11+
import com.expedia.graphql.generator.types.ListTypeBuilder
12+
import com.expedia.graphql.generator.types.ObjectTypeBuilder
13+
import com.expedia.graphql.generator.types.PropertyTypeBuilder
14+
import com.expedia.graphql.generator.types.ScalarTypeBuilder
15+
import com.expedia.graphql.generator.types.UnionTypeBuilder
1616
import graphql.schema.GraphQLInterfaceType
1717
import graphql.schema.GraphQLObjectType
1818
import graphql.schema.GraphQLSchema

src/main/kotlin/com/expedia/graphql/schema/generator/SubTypeMapper.kt renamed to src/main/kotlin/com/expedia/graphql/generator/SubTypeMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.expedia.graphql.schema.generator
1+
package com.expedia.graphql.generator
22

33
import org.reflections.Reflections
44
import kotlin.reflect.KClass

src/main/kotlin/com/expedia/graphql/schema/generator/TypeBuilder.kt renamed to src/main/kotlin/com/expedia/graphql/generator/TypeBuilder.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package com.expedia.graphql.schema.generator
2-
3-
import com.expedia.graphql.schema.extensions.getKClass
4-
import com.expedia.graphql.schema.extensions.isArray
5-
import com.expedia.graphql.schema.extensions.isEnum
6-
import com.expedia.graphql.schema.extensions.isGraphQLInterface
7-
import com.expedia.graphql.schema.extensions.isGraphQLUnion
8-
import com.expedia.graphql.schema.extensions.isList
9-
import com.expedia.graphql.schema.extensions.wrapInNonNull
10-
import com.expedia.graphql.schema.generator.models.KGraphQLType
1+
package com.expedia.graphql.generator
2+
3+
import com.expedia.graphql.generator.extensions.getKClass
4+
import com.expedia.graphql.generator.extensions.isArray
5+
import com.expedia.graphql.generator.extensions.isEnum
6+
import com.expedia.graphql.generator.extensions.isGraphQLInterface
7+
import com.expedia.graphql.generator.extensions.isGraphQLUnion
8+
import com.expedia.graphql.generator.extensions.isList
9+
import com.expedia.graphql.generator.extensions.wrapInNonNull
10+
import com.expedia.graphql.generator.state.KGraphQLType
11+
import com.expedia.graphql.generator.state.TypesCacheKey
1112
import graphql.schema.GraphQLType
1213
import kotlin.reflect.KClass
1314
import kotlin.reflect.KType

src/main/kotlin/com/expedia/graphql/schema/extensions/annotationExtensions.kt renamed to src/main/kotlin/com/expedia/graphql/generator/extensions/annotationExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.expedia.graphql.schema.extensions
1+
package com.expedia.graphql.generator.extensions
22

33
import com.expedia.graphql.annotations.GraphQLDescription
44
import com.expedia.graphql.annotations.GraphQLID

0 commit comments

Comments
 (0)