Skip to content

feat: do not append duplicate input suffix #157

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 3 commits into from
Jan 29, 2019
Merged

feat: do not append duplicate input suffix #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c64b56
feat: do not append duplicate suffix
Jan 29, 2019
9650f33
test: move test function
Jan 29, 2019
bfe2d34
Merge branch 'master' into input-suffix
smyrick Jan 29, 2019
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: 3 additions & 1 deletion src/main/kotlin/com/expedia/graphql/generator/extensions/kClassExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import kotlin.reflect.full.isSubclassOf
import kotlin.reflect.full.primaryConstructor
import kotlin.reflect.full.superclasses

private const val INPUT_SUFFIX = "Input"

internal fun KClass<*>.getValidProperties(hooks: SchemaGeneratorHooks): List<KProperty<*>> =
this.declaredMemberProperties
.filter { hooks.isValidProperty(it) }
Expand Down Expand Up @@ -53,7 +55,7 @@ internal fun KClass<*>.getSimpleName(isInputClass: Boolean = false): String {
val name = this.simpleName ?: throw CouldNotGetNameOfKClassException(this)

return when {
isInputClass -> "${name}Input"
isInputClass -> if (name.endsWith(INPUT_SUFFIX)) name else "$name$INPUT_SUFFIX"
else -> name
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/test/kotlin/com/expedia/graphql/generator/extensions/KClassExtensionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ open class KClassExtensionsTest {

internal class MyInternalClass

class MyClassInput

protected class MyProtectedClass

class MyPublicClass
Expand Down Expand Up @@ -180,6 +182,7 @@ open class KClassExtensionsTest {
@Test
fun `test input class name`() {
assertEquals("MyTestClassInput", MyTestClass::class.getSimpleName(true))
assertEquals("MyClassInput", MyClassInput::class.getSimpleName(true))
}

@Test
Expand Down