Fix deprecations and compile warnings (#1230)

* Fix deprecations and compile warnings

* Update example and remove big decimal example

* Use provided default for locale

* Run optimize imports

Author: smyrick

clients/graphql-kotlin-client-serialization/src/test/kotlin/com/expediagroup/graphql/client/serialization/types/serializers/AnyKSerializerTest.kt

@@ -17,6 +17,7 @@
 package com.expediagroup.graphql.client.serialization.types.serializers
 
 import com.expediagroup.graphql.client.serialization.serializers.AnyKSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -57,6 +58,7 @@ class AnyKSerializerTest {
     """.trimMargin()
 
     @Test
+    @ExperimentalSerializationApi
     fun `verify serialization logic`() {
         val json = Json {
             prettyPrint = true

clients/graphql-kotlin-client-serialization/src/test/kotlin/com/expediagroup/graphql/client/serialization/types/serializers/GraphQLErrorPathSerializerTest.kt

@@ -17,6 +17,7 @@
 package com.expediagroup.graphql.client.serialization.types.serializers
 
 import com.expediagroup.graphql.client.serialization.serializers.GraphQLErrorPathSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -41,6 +42,7 @@ class GraphQLErrorPathSerializerTest {
     """.trimMargin()
 
     @Test
+    @ExperimentalSerializationApi
     fun `verify serialization`() {
         val json = Json {
             prettyPrint = true

clients/graphql-kotlin-ktor-client/src/test/kotlin/com/expediagroup/graphql/client/ktor/GraphQLKtorClientTest.kt

@@ -22,11 +22,11 @@ import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLResponse
 import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLSourceLocation
 import com.expediagroup.graphql.client.serialization.GraphQLClientKotlinxSerializer
 import com.expediagroup.graphql.client.serialization.serializers.AnyKSerializer
-import com.expediagroup.graphql.client.types.GraphQLClientRequest
-import com.expediagroup.graphql.client.types.GraphQLClientResponse
 import com.expediagroup.graphql.client.serialization.types.KotlinxGraphQLError
 import com.expediagroup.graphql.client.serialization.types.KotlinxGraphQLResponse
 import com.expediagroup.graphql.client.serialization.types.KotlinxGraphQLSourceLocation
+import com.expediagroup.graphql.client.types.GraphQLClientRequest
+import com.expediagroup.graphql.client.types.GraphQLClientResponse
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.github.tomakehurst.wiremock.WireMockServer
 import com.github.tomakehurst.wiremock.client.MappingBuilder

clients/graphql-kotlin-spring-client/src/test/kotlin/com/expediagroup/graphql/client/spring/GraphQLWebClientTest.kt

@@ -17,8 +17,8 @@
 package com.expediagroup.graphql.client.spring
 
 import com.expediagroup.graphql.client.jackson.GraphQLClientJacksonSerializer
-import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLResponse
 import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLError
+import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLResponse
 import com.expediagroup.graphql.client.jackson.types.JacksonGraphQLSourceLocation
 import com.expediagroup.graphql.client.serialization.GraphQLClientKotlinxSerializer
 import com.expediagroup.graphql.client.serialization.serializers.AnyKSerializer

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/server/spring/directives/CustomDirectiveWiringFactory.kt

@@ -27,11 +27,11 @@ class CustomDirectiveWiringFactory : KotlinDirectiveWiringFactory(manualWiring =
     private val stringEvalDirectiveWiring = StringEvalSchemaDirectiveWiring()
     private val caleOnlyDirectiveWiring = SpecificValueOnlySchemaDirectiveWiring()
 
-    override fun getSchemaDirectiveWiring(environment: KotlinSchemaDirectiveEnvironment<GraphQLDirectiveContainer>): KotlinSchemaDirectiveWiring? = when {
-        environment.directive.name == getDirectiveName(StringEval::class) -> stringEvalDirectiveWiring
-        environment.directive.name == getDirectiveName(SpecificValueOnly::class) -> caleOnlyDirectiveWiring
+    override fun getSchemaDirectiveWiring(environment: KotlinSchemaDirectiveEnvironment<GraphQLDirectiveContainer>): KotlinSchemaDirectiveWiring? = when (environment.directive.name) {
+        getDirectiveName(StringEval::class) -> stringEvalDirectiveWiring
+        getDirectiveName(SpecificValueOnly::class) -> caleOnlyDirectiveWiring
         else -> null
     }
 }
 
-internal fun getDirectiveName(kClass: KClass<out Annotation>): String = kClass.simpleName!!.decapitalize()
+internal fun getDirectiveName(kClass: KClass<out Annotation>): String = kClass.simpleName!!.replaceFirstChar { it.lowercase() }

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/server/spring/directives/LowercaseSchemaDirectiveWiring.kt

@@ -20,20 +20,16 @@ import com.expediagroup.graphql.generator.directives.KotlinFieldDirectiveEnviron
 import com.expediagroup.graphql.generator.directives.KotlinSchemaDirectiveWiring
 import graphql.schema.DataFetcher
 import graphql.schema.DataFetcherFactories
-import graphql.schema.DataFetchingEnvironment
 import graphql.schema.GraphQLFieldDefinition
-import java.util.function.BiFunction
 
 class LowercaseSchemaDirectiveWiring : KotlinSchemaDirectiveWiring {
 
     override fun onField(environment: KotlinFieldDirectiveEnvironment): GraphQLFieldDefinition {
         val field = environment.element
         val originalDataFetcher: DataFetcher<*> = environment.getDataFetcher()
-
-        val lowerCaseFetcher = DataFetcherFactories.wrapDataFetcher(
-            originalDataFetcher,
-            BiFunction<DataFetchingEnvironment, Any, Any> { _, value -> value.toString().toLowerCase() }
-        )
+        val lowerCaseFetcher = DataFetcherFactories.wrapDataFetcher(originalDataFetcher) { _, value ->
+            value.toString().lowercase()
+        }
         environment.setDataFetcher(lowerCaseFetcher)
         return field
     }

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/server/spring/directives/StringEvalSchemaDirectiveWiring.kt

@@ -37,7 +37,7 @@ class StringEvalSchemaDirectiveWiring : KotlinSchemaDirectiveWiring {
                 dataEnv.getArgument(it.name) as String?
             }.forEach { (graphQLArgumentType, value) ->
                 if (graphQLArgumentType.getDirective(directiveName).getArgument(StringEval::lowerCase.name).value as Boolean) {
-                    newArguments[graphQLArgumentType.name] = value?.toLowerCase()
+                    newArguments[graphQLArgumentType.name] = value?.lowercase()
                 }
                 if (value.isNullOrEmpty()) {
                     newArguments[graphQLArgumentType.name] = graphQLArgumentType.defaultValue

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/server/spring/hooks/CustomSchemaGeneratorHooks.kt

@@ -18,7 +18,6 @@ package com.expediagroup.graphql.examples.server.spring.hooks
 
 import com.expediagroup.graphql.generator.directives.KotlinDirectiveWiringFactory
 import com.expediagroup.graphql.generator.hooks.SchemaGeneratorHooks
-import graphql.Scalars
 import graphql.language.StringValue
 import graphql.schema.Coercing
 import graphql.schema.CoercingParseLiteralException
@@ -28,7 +27,6 @@ import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLType
 import org.springframework.beans.factory.BeanFactoryAware
 import reactor.core.publisher.Mono
-import java.math.BigDecimal
 import java.util.UUID
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
@@ -45,7 +43,6 @@ class CustomSchemaGeneratorHooks(override val wiringFactory: KotlinDirectiveWiri
      */
     override fun willGenerateGraphQLType(type: KType): GraphQLType? = when (type.classifier) {
         UUID::class -> graphqlUUIDType
-        BigDecimal::class -> Scalars.GraphQLBigDecimal
         else -> null
     }
 

examples/server/spring-server/src/main/kotlin/com/expediagroup/graphql/examples/server/spring/query/ScalarQuery.kt

@@ -21,9 +21,7 @@ import com.expediagroup.graphql.generator.annotations.GraphQLDescription
 import com.expediagroup.graphql.generator.scalars.ID
 import com.expediagroup.graphql.server.operations.Query
 import org.springframework.stereotype.Component
-import java.math.BigDecimal
 import java.util.UUID
-import kotlin.random.Random
 
 /**
  * Simple query that exposes custom scalar.
@@ -41,7 +39,4 @@ class ScalarQuery : Query {
 
     @GraphQLDescription("generates random GraphQL ID")
     fun generateRandomId() = ID(UUID.randomUUID().toString())
-
-    @GraphQLDescription("generates random BigDecimal")
-    fun generateRandomBigDecimal(): BigDecimal = BigDecimal(Random.nextLong())
 }