Skip to content

Remove guava for Kotlin builtin decapitalize #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2019
Merged

Remove guava for Kotlin builtin decapitalize #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .../main/kotlin/com/expediagroup/graphql/examples/directives/CustomDirectiveWiringFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package com.expediagroup.graphql.examples.directives
import com.expediagroup.graphql.directives.KotlinDirectiveWiringFactory
import com.expediagroup.graphql.directives.KotlinSchemaDirectiveEnvironment
import com.expediagroup.graphql.directives.KotlinSchemaDirectiveWiring
import com.google.common.base.CaseFormat
import graphql.schema.GraphQLDirectiveContainer
import kotlin.reflect.KClass

Expand All @@ -35,5 +34,4 @@ class CustomDirectiveWiringFactory : KotlinDirectiveWiringFactory(manualWiring =
}
}

internal fun getDirectiveName(kClass: KClass<out Annotation>): String =
CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, kClass.simpleName!!)
internal fun getDirectiveName(kClass: KClass<out Annotation>): String = kClass.simpleName!!.decapitalize()
6 changes: 0 additions & 6 deletions graphql-kotlin-schema-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<properties>
<project.root>${project.basedir}/..</project.root>
<rxjava2.version>2.2.12</rxjava2.version>
<guava.version>28.0-jre</guava.version>
</properties>

<dependencies>
Expand All @@ -36,11 +35,6 @@
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions ...ma-generator/src/main/kotlin/com/expediagroup/graphql/generator/types/DirectiveBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import com.expediagroup.graphql.generator.extensions.getPropertyAnnotations
import com.expediagroup.graphql.generator.extensions.getSimpleName
import com.expediagroup.graphql.generator.extensions.getValidProperties
import com.expediagroup.graphql.generator.extensions.safeCast
import com.google.common.base.CaseFormat
import graphql.schema.GraphQLArgument
import graphql.schema.GraphQLDirective
import java.lang.reflect.Field
Expand Down Expand Up @@ -95,7 +94,7 @@ internal class DirectiveBuilder(generator: SchemaGenerator) : TypeBuilder(genera
}
}

private fun String.normalizeDirectiveName() = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, this)
private fun String.normalizeDirectiveName() = this.decapitalize()

private fun Annotation.getDirectiveInfo(): DirectiveInfo? = this.annotationClass.annotations
.filterIsInstance(GraphQLDirectiveAnnotation::class.java)
Expand Down