Fix package access

vojtapol · vojtapol · commit e4690db34758 · 2020-04-18T12:29:25.000-04:00
diff --git a/src/main/kotlin/graphql/kickstart/tools/FieldResolver.kt b/src/main/kotlin/graphql/kickstart/tools/FieldResolver.kt
@@ -1,6 +1,5 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
-import graphql.kickstart.tools.SchemaParserOptions
 import graphql.kickstart.tools.util.JavaType
 import graphql.language.FieldDefinition
 import graphql.schema.DataFetcher
diff --git a/src/main/kotlin/graphql/kickstart/tools/FieldResolverScanner.kt b/src/main/kotlin/graphql/kickstart/tools/FieldResolverScanner.kt
@@ -1,7 +1,6 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
 import graphql.Scalars
-import graphql.kickstart.tools.SchemaParserOptions
 import graphql.kickstart.tools.util.GraphQLLangType
 import graphql.kickstart.tools.util.JavaType
 import graphql.kickstart.tools.util.declaredNonProxyMethods
diff --git a/src/main/kotlin/graphql/kickstart/tools/GenericType.kt b/src/main/kotlin/graphql/kickstart/tools/GenericType.kt
@@ -1,7 +1,6 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
 import com.fasterxml.classmate.ResolvedType
-import graphql.kickstart.tools.SchemaParserOptions
 import graphql.kickstart.tools.util.JavaType
 import graphql.kickstart.tools.util.ParameterizedTypeImpl
 import graphql.kickstart.tools.util.Primitives
diff --git a/src/main/kotlin/graphql/kickstart/tools/MethodFieldResolver.kt b/src/main/kotlin/graphql/kickstart/tools/MethodFieldResolver.kt
@@ -1,9 +1,8 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
 import com.fasterxml.jackson.core.type.TypeReference
 import graphql.TrivialDataFetcher
 import graphql.execution.batched.Batched
-import graphql.kickstart.tools.SchemaParserOptions
 import graphql.kickstart.tools.SchemaParserOptions.GenericWrapper
 import graphql.kickstart.tools.util.JavaType
 import graphql.kickstart.tools.util.coroutineScope
diff --git a/src/main/kotlin/graphql/kickstart/tools/PropertyFieldResolver.kt b/src/main/kotlin/graphql/kickstart/tools/PropertyFieldResolver.kt
@@ -1,6 +1,5 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
-import graphql.kickstart.tools.SchemaParserOptions
 import graphql.language.FieldDefinition
 import graphql.schema.DataFetcher
 import graphql.schema.DataFetchingEnvironment
diff --git a/src/main/kotlin/graphql/kickstart/tools/PropertyMapResolver.kt b/src/main/kotlin/graphql/kickstart/tools/PropertyMapResolver.kt
@@ -1,7 +1,6 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
 import com.fasterxml.classmate.TypeResolver
-import graphql.kickstart.tools.SchemaParserOptions
 import graphql.kickstart.tools.util.JavaType
 import graphql.language.FieldDefinition
 import graphql.schema.DataFetcher
diff --git a/src/main/kotlin/graphql/kickstart/tools/ResolverInfo.kt b/src/main/kotlin/graphql/kickstart/tools/ResolverInfo.kt
@@ -1,7 +1,5 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
-import graphql.kickstart.tools.GraphQLResolver
-import graphql.kickstart.tools.SchemaParserOptions
 import graphql.kickstart.tools.util.GraphQLRootResolver
 import graphql.kickstart.tools.util.JavaType
 import org.apache.commons.lang3.reflect.TypeUtils
diff --git a/src/main/kotlin/graphql/kickstart/tools/RootTypeInfo.kt b/src/main/kotlin/graphql/kickstart/tools/RootTypeInfo.kt
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
 import graphql.language.SchemaDefinition
 import graphql.language.TypeName
diff --git a/src/main/kotlin/graphql/kickstart/tools/ScannedSchemaObjects.kt b/src/main/kotlin/graphql/kickstart/tools/ScannedSchemaObjects.kt
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
 import graphql.kickstart.tools.util.BiMap
 import graphql.kickstart.tools.util.JavaType
diff --git a/src/main/kotlin/graphql/kickstart/tools/SchemaClassScanner.kt b/src/main/kotlin/graphql/kickstart/tools/SchemaClassScanner.kt
@@ -1,6 +1,5 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
-import graphql.kickstart.tools.*
 import graphql.kickstart.tools.util.*
 import graphql.language.*
 import graphql.schema.GraphQLScalarType
diff --git a/src/main/kotlin/graphql/kickstart/tools/SchemaParser.kt b/src/main/kotlin/graphql/kickstart/tools/SchemaParser.kt
@@ -2,8 +2,6 @@ package graphql.kickstart.tools
 
 import graphql.introspection.Introspection
 import graphql.kickstart.tools.directive.SchemaGeneratorDirectiveHelper
-import graphql.kickstart.tools.scanner.ScannedSchemaObjects
-import graphql.kickstart.tools.scanner.SchemaClassScanner
 import graphql.kickstart.tools.util.getExtendedFieldDefinitions
 import graphql.kickstart.tools.util.unwrap
 import graphql.language.*
diff --git a/src/main/kotlin/graphql/kickstart/tools/SchemaParserBuilder.kt b/src/main/kotlin/graphql/kickstart/tools/SchemaParserBuilder.kt
@@ -1,7 +1,5 @@
 package graphql.kickstart.tools
 
-import graphql.kickstart.tools.scanner.ScannedSchemaObjects
-import graphql.kickstart.tools.scanner.SchemaClassScanner
 import graphql.language.Definition
 import graphql.language.Document
 import graphql.parser.Parser
diff --git a/src/main/kotlin/graphql/kickstart/tools/TypeClassMatcher.kt b/src/main/kotlin/graphql/kickstart/tools/TypeClassMatcher.kt
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.scanner
+package graphql.kickstart.tools
 
 import graphql.execution.DataFetcherResult
 import graphql.kickstart.tools.util.GraphQLLangType
diff --git a/src/test/groovy/graphql/kickstart/tools/FieldResolverScannerSpec.groovy b/src/test/groovy/graphql/kickstart/tools/FieldResolverScannerSpec.groovy
@@ -1,6 +1,6 @@
 package graphql.kickstart.tools
 
-import graphql.kickstart.tools.scanner.*
+
 import graphql.language.FieldDefinition
 import graphql.language.TypeName
 import graphql.relay.Connection
diff --git a/src/test/groovy/graphql/kickstart/tools/MethodFieldResolverDataFetcherSpec.groovy b/src/test/groovy/graphql/kickstart/tools/MethodFieldResolverDataFetcherSpec.groovy
@@ -4,7 +4,6 @@ import graphql.Assert
 import graphql.ExecutionResult
 import graphql.execution.*
 import graphql.execution.instrumentation.SimpleInstrumentation
-import graphql.kickstart.tools.scanner.*
 import graphql.language.FieldDefinition
 import graphql.language.InputValueDefinition
 import graphql.language.NonNullType
diff --git a/src/test/groovy/graphql/kickstart/tools/SchemaClassScannerSpec.groovy b/src/test/groovy/graphql/kickstart/tools/SchemaClassScannerSpec.groovy
@@ -1,8 +1,6 @@
 package graphql.kickstart.tools
 
 import graphql.execution.batched.Batched
-import graphql.kickstart.tools.scanner.ResolverError
-import graphql.kickstart.tools.scanner.ScannedSchemaObjects
 import graphql.language.InputObjectTypeDefinition
 import graphql.language.InterfaceTypeDefinition
 import graphql.language.ObjectTypeDefinition
diff --git a/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy b/src/test/groovy/graphql/kickstart/tools/SchemaParserSpec.groovy
@@ -1,7 +1,6 @@
 package graphql.kickstart.tools
 
-import graphql.kickstart.tools.scanner.FieldResolverError
-import graphql.kickstart.tools.scanner.SchemaClassScannerError
+
 import graphql.language.SourceLocation
 import graphql.schema.GraphQLSchema
 import org.springframework.aop.framework.ProxyFactory
diff --git a/src/test/groovy/graphql/kickstart/tools/TypeClassMatcherSpec.groovy b/src/test/groovy/graphql/kickstart/tools/TypeClassMatcherSpec.groovy
@@ -1,9 +1,6 @@
 package graphql.kickstart.tools
 
-import graphql.kickstart.tools.scanner.FieldResolverScanner
-import graphql.kickstart.tools.scanner.RootResolverInfo
-import graphql.kickstart.tools.scanner.SchemaClassScannerError
-import graphql.kickstart.tools.scanner.TypeClassMatcher
+
 import graphql.language.*
 import spock.lang.Specification
 import spock.lang.Unroll
diff --git a/src/test/kotlin/graphql/kickstart/tools/MethodFieldResolverDataFetcherTest.kt b/src/test/kotlin/graphql/kickstart/tools/MethodFieldResolverDataFetcherTest.kt
@@ -3,9 +3,6 @@ package graphql.kickstart.tools
 import graphql.ExecutionResult
 import graphql.execution.*
 import graphql.execution.instrumentation.SimpleInstrumentation
-import graphql.kickstart.tools.scanner.FieldResolverScanner
-import graphql.kickstart.tools.scanner.NormalResolverInfo
-import graphql.kickstart.tools.scanner.RootResolverInfo
 import graphql.language.FieldDefinition
 import graphql.language.InputValueDefinition
 import graphql.language.TypeName

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package graphql.kickstart.tools.scanner`
	`1`	`+package graphql.kickstart.tools`
`2`	`2`
`3`	`3`	`import graphql.language.SchemaDefinition`
`4`	`4`	`import graphql.language.TypeName`