Skip to content

Commit 2ba519b

Browse files
authored
[generator] remove extended scalars (ExpediaGroup#1171)
Extended scalars were deprecated in `graphql-java` v15 in favor of separate `graphql-java-extended-scalars` project. Extended scalars are problematic as clients have to explicitly know how to handle them and what they represent. Due to the all the drawbacks, instead of automatically providing support for deprecated functionality, users should explicitly opt-in into this functionality by using custom hooks.
1 parent cf9297b commit 2ba519b

File tree

3 files changed

+2
-16
lines changed
  • examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/server/spring/subscriptions
  • generator/graphql-kotlin-schema-generator/src

3 files changed

+2
-16
lines changed

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/server/spring/subscriptions/SimpleSubscription.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ class SimpleSubscription : Subscription {
4040
fun singleValueSubscription(): Flux<Int> = Flux.just(1)
4141

4242
@GraphQLDescription("Returns a random number every second")
43-
fun counter(limit: Long? = null): Flux<Int> {
43+
fun counter(limit: Int? = null): Flux<Int> {
4444
val flux = Flux.interval(Duration.ofSeconds(1)).map {
4545
val value = Random.nextInt()
4646
logger.info("Returning $value from counter")
4747
value
4848
}
4949

5050
return if (limit != null) {
51-
flux.take(limit)
51+
flux.take(limit.toLong())
5252
} else {
5353
flux
5454
}

generator/graphql-kotlin-schema-generator/src/main/kotlin/com/expediagroup/graphql/generator/internal/types/generateScalar.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import com.expediagroup.graphql.generator.internal.extensions.safeCast
2222
import com.expediagroup.graphql.generator.scalars.ID
2323
import graphql.Scalars
2424
import graphql.schema.GraphQLScalarType
25-
import java.math.BigDecimal
26-
import java.math.BigInteger
2725
import kotlin.reflect.KClass
2826
import kotlin.reflect.KType
2927

@@ -38,13 +36,8 @@ internal fun generateScalar(generator: SchemaGenerator, type: KType): GraphQLSca
3836

3937
private val defaultScalarsMap = mapOf(
4038
Int::class to Scalars.GraphQLInt,
41-
Long::class to Scalars.GraphQLLong,
42-
Short::class to Scalars.GraphQLShort,
4339
Float::class to Scalars.GraphQLFloat,
4440
Double::class to Scalars.GraphQLFloat,
45-
BigDecimal::class to Scalars.GraphQLBigDecimal,
46-
BigInteger::class to Scalars.GraphQLBigInteger,
47-
Char::class to Scalars.GraphQLChar,
4841
String::class to Scalars.GraphQLString,
4942
Boolean::class to Scalars.GraphQLBoolean,
5043
ID::class to Scalars.GraphQLID

generator/graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/internal/types/GenerateScalarTest.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import com.expediagroup.graphql.generator.scalars.ID
2020
import graphql.Scalars
2121
import graphql.schema.GraphQLScalarType
2222
import org.junit.jupiter.api.Test
23-
import java.math.BigDecimal
24-
import java.math.BigInteger
2523
import kotlin.reflect.KType
2624
import kotlin.reflect.full.createType
2725
import kotlin.test.assertEquals
@@ -31,13 +29,8 @@ class GenerateScalarTest : TypeTestHelper() {
3129
@Test
3230
fun `test all types`() {
3331
verify(Int::class.createType(), Scalars.GraphQLInt)
34-
verify(Long::class.createType(), Scalars.GraphQLLong)
35-
verify(Short::class.createType(), Scalars.GraphQLShort)
3632
verify(Float::class.createType(), Scalars.GraphQLFloat)
3733
verify(Double::class.createType(), Scalars.GraphQLFloat)
38-
verify(BigDecimal::class.createType(), Scalars.GraphQLBigDecimal)
39-
verify(BigInteger::class.createType(), Scalars.GraphQLBigInteger)
40-
verify(Char::class.createType(), Scalars.GraphQLChar)
4134
verify(String::class.createType(), Scalars.GraphQLString)
4235
verify(Boolean::class.createType(), Scalars.GraphQLBoolean)
4336
verify(ID::class.createType(), Scalars.GraphQLID)

0 commit comments

Comments
 (0)