Skip to content

Commit c97eab8

Browse files
authored
Run intellij code clean up on all source files (#379)
1 parent e98e590 commit c97eab8

File tree

5 files changed

+5
-27
lines changed

5 files changed

+5
-27
lines changed

graphql-kotlin-federation/src/main/kotlin/com/expediagroup/graphql/federation/FederatedSchemaGeneratorHooks.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import kotlin.reflect.full.findAnnotation
4444
open class FederatedSchemaGeneratorHooks(private val federatedTypeRegistry: FederatedTypeRegistry) : SchemaGeneratorHooks {
4545
private val directiveRegex = "(^#.+$[\\r\\n])?^directive @\\w+.+$[\\r\\n]*".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
4646
private val scalarRegex = "(^#.+$[\\r\\n])?^scalar (_FieldSet|_Any)$[\\r\\n]*".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
47-
private val emptyQuery = "^type Query \\{$\\s+^\\}$\\s+".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
47+
private val emptyQuery = "^type Query \\{$\\s+^}$\\s+".toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
4848
private val validator = FederatedSchemaValidator()
4949

5050
override fun willGenerateGraphQLType(type: KType): GraphQLType? = when (type.classifier) {

graphql-kotlin-schema-generator/src/main/kotlin/com/expediagroup/graphql/exceptions/InvalidSchemaException.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

graphql-kotlin-schema-generator/src/main/kotlin/com/expediagroup/graphql/generator/SchemaGenerator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import kotlin.reflect.KParameter
4646
import kotlin.reflect.KProperty
4747
import kotlin.reflect.KType
4848

49+
@Suppress("LeakingThis")
4950
open class SchemaGenerator(val config: SchemaGeneratorConfig) {
5051

5152
internal val state = SchemaGeneratorState(config.supportedPackages)

graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/RoutesConfiguration.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ class RoutesConfiguration(
4545
private val queryHandler: QueryHandler,
4646
private val objectMapper: ObjectMapper
4747
) {
48-
@Suppress("VariableNaming")
49-
private val APPLICATION_GRAPHQL: MediaType = MediaType("application", "graphql")
48+
private val graphQLMediaType: MediaType = MediaType("application", "graphql")
5049
private val mapTypeReference: MapType = TypeFactory.defaultInstance().constructMapType(HashMap::class.java, String::class.java, Any::class.java)
5150

5251
@Bean
@@ -80,7 +79,7 @@ class RoutesConfiguration(
8079
}
8180
serverRequest.method() == HttpMethod.POST -> when (serverRequest.headers().contentType().orElse(MediaType.APPLICATION_JSON)) {
8281
MediaType.APPLICATION_JSON -> serverRequest.awaitBody()
83-
APPLICATION_GRAPHQL -> GraphQLRequest(query = serverRequest.awaitBody())
82+
graphQLMediaType -> GraphQLRequest(query = serverRequest.awaitBody())
8483
else -> null
8584
}
8685
else -> null

graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/spring/execution/SubscriptionHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import graphql.GraphQL
2626
import org.reactivestreams.Publisher
2727
import reactor.core.publisher.Flux
2828
import reactor.core.publisher.Mono
29-
import reactor.core.publisher.toFlux
29+
import reactor.kotlin.core.publisher.toFlux
3030

3131
/**
3232
* GraphQL subscription handler.

0 commit comments

Comments
 (0)