Skip to content

Commit 8787dd8

Browse files
WipeAirWipeAir
committed
chore: apply new ktlint codestyle
1 parent 70ab948 commit 8787dd8

File tree

33 files changed

+216
-169
lines changed

33 files changed

+216
-169
lines changed

‎graphql-kotlin-toolkit-codegen/src/main/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/AbstractInputDataClassGenerator.kt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,16 @@ internal abstract class AbstractInputDataClassGenerator(
5757
private fun buildDataClassCompanionObject(): TypeSpec {
5858
return TypeSpec.companionObjectBuilder()
5959
.addFunction(createBuilderFun())
60-
.addFunctions(dataProperties
61-
.map {
62-
argumentCodeBlockGenerator.buildResolver(
63-
it.name,
64-
it.type,
65-
it.directiveContainer
66-
)
67-
})
60+
.addFunctions(
61+
dataProperties
62+
.map {
63+
argumentCodeBlockGenerator.buildResolver(
64+
it.name,
65+
it.type,
66+
it.directiveContainer
67+
)
68+
}
69+
)
6870
.build()
6971
}
7072

‎graphql-kotlin-toolkit-codegen/src/main/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/EnumGenerator.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ internal class EnumGenerator(
4848
// Go through all enum values and create enum constants within this enum.
4949
enum.values.forEach { enum ->
5050
builder.addEnumConstant(
51-
enum.name, TypeSpec.anonymousClassBuilder()
51+
enum.name,
52+
TypeSpec.anonymousClassBuilder()
5253
.addSuperclassConstructorParameter("%S", enum.name)
5354
.build()
5455
)

‎graphql-kotlin-toolkit-codegen/src/main/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/fieldResolver/FieldResolverGenerator.kt‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,32 @@ internal class FieldResolverGenerator(
4444
.returns(fieldTypeName).build()
4545
)
4646

47-
builder.addFunction(FunSpec.builder("get")
48-
.addModifiers(KModifier.OVERRIDE)
49-
.addParameter("env", ClassName("graphql.schema", "DataFetchingEnvironment"))
50-
.returns(getKotlinType(field.type))
51-
.also { getFunSpec ->
52-
val resolveArgs = field.arguments.let { args ->
53-
if (args.isEmpty())
54-
return@let ""
47+
builder.addFunction(
48+
FunSpec.builder("get")
49+
.addModifiers(KModifier.OVERRIDE)
50+
.addParameter("env", ClassName("graphql.schema", "DataFetchingEnvironment"))
51+
.returns(getKotlinType(field.type))
52+
.also { getFunSpec ->
53+
val resolveArgs = field.arguments.let { args ->
54+
if (args.isEmpty())
55+
return@let ""
5556

56-
return@let args.joinToString(", ") {
57-
"${it.name} = resolve${NamingHelper.uppercaseFirstLetter(it.name)}(map)"
58-
} + ", "
59-
}
57+
return@let args.joinToString(", ") {
58+
"${it.name} = resolve${NamingHelper.uppercaseFirstLetter(it.name)}(map)"
59+
} + ", "
60+
}
6061

61-
// Variable assignment is unnecessary if there are no arguments.
62-
if (field.arguments.isNotEmpty())
63-
getFunSpec.addStatement("val map = env.arguments")
62+
// Variable assignment is unnecessary if there are no arguments.
63+
if (field.arguments.isNotEmpty())
64+
getFunSpec.addStatement("val map = env.arguments")
6465

65-
getFunSpec.addStatement(
66-
"return resolve(${resolveArgs}env = %T(env))",
67-
generatedMapper.getFieldResolverEnvironment(container, field)
68-
)
69-
}
70-
.build())
66+
getFunSpec.addStatement(
67+
"return resolve(${resolveArgs}env = %T(env))",
68+
generatedMapper.getFieldResolverEnvironment(container, field)
69+
)
70+
}
71+
.build()
72+
)
7173
}
7274

7375
private val environmentTypeSpec =

‎graphql-kotlin-toolkit-codegen/src/main/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/fieldResolver/PaginationFieldResolverGenerator.kt‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,42 +66,44 @@ internal class PaginationFieldResolverGenerator(
6666
.returns(resultHolderClassName).build()
6767
)
6868

69-
builder.addFunction(FunSpec.builder("get")
70-
.addModifiers(KModifier.OVERRIDE)
71-
.addParameter("env", ClassName("graphql.schema", "DataFetchingEnvironment"))
72-
.returns(generatedMapper.getPaginationConnectionClassName().parameterizedBy(unwrappedReturnKotlinType))
73-
.also { getFunSpec ->
74-
val resolveArgs = field.arguments.let { args ->
75-
if (args.isEmpty())
76-
return@let ""
69+
builder.addFunction(
70+
FunSpec.builder("get")
71+
.addModifiers(KModifier.OVERRIDE)
72+
.addParameter("env", ClassName("graphql.schema", "DataFetchingEnvironment"))
73+
.returns(generatedMapper.getPaginationConnectionClassName().parameterizedBy(unwrappedReturnKotlinType))
74+
.also { getFunSpec ->
75+
val resolveArgs = field.arguments.let { args ->
76+
if (args.isEmpty())
77+
return@let ""
7778

78-
return@let args.joinToString(", ") {
79-
"${it.name} = resolve${NamingHelper.uppercaseFirstLetter(it.name)}(map)"
80-
} + ", "
81-
}
79+
return@let args.joinToString(", ") {
80+
"${it.name} = resolve${NamingHelper.uppercaseFirstLetter(it.name)}(map)"
81+
} + ", "
82+
}
8283

83-
getFunSpec.addStatement("val map = env.arguments")
84-
getFunSpec.addStatement(
85-
"val internalEnv = %T(env, %M(map))",
86-
generatedMapper.getFieldResolverEnvironment(container, field),
87-
generatedMapper.getPaginationInfoBuilderMemberName()
88-
)
89-
getFunSpec.addStatement("val result = resolve(${resolveArgs}env = internalEnv)")
84+
getFunSpec.addStatement("val map = env.arguments")
85+
getFunSpec.addStatement(
86+
"val internalEnv = %T(env, %M(map))",
87+
generatedMapper.getFieldResolverEnvironment(container, field),
88+
generatedMapper.getPaginationInfoBuilderMemberName()
89+
)
90+
getFunSpec.addStatement("val result = resolve(${resolveArgs}env = internalEnv)")
9091

91-
getFunSpec.addStatement(
92-
"val edges = result.data.map { %T(it, resolveCursor(it, internalEnv)) }",
93-
generatedMapper.getPaginationEdgeClassName()
94-
)
95-
getFunSpec.addStatement(
96-
"val pageInfo = %T(result.hasNextPage, result.hasPreviousPage, edges.firstOrNull()?.cursor, edges.lastOrNull()?.cursor)",
97-
generatedMapper.getPaginationPageInfoClassName()
98-
)
99-
getFunSpec.addStatement(
100-
"return %T(edges, pageInfo)",
101-
generatedMapper.getPaginationConnectionClassName()
102-
)
103-
}
104-
.build())
92+
getFunSpec.addStatement(
93+
"val edges = result.data.map { %T(it, resolveCursor(it, internalEnv)) }",
94+
generatedMapper.getPaginationEdgeClassName()
95+
)
96+
getFunSpec.addStatement(
97+
"val pageInfo = %T(result.hasNextPage, result.hasPreviousPage, edges.firstOrNull()?.cursor, edges.lastOrNull()?.cursor)",
98+
generatedMapper.getPaginationPageInfoClassName()
99+
)
100+
getFunSpec.addStatement(
101+
"return %T(edges, pageInfo)",
102+
generatedMapper.getPaginationConnectionClassName()
103+
)
104+
}
105+
.build()
106+
)
105107
}
106108

107109
/**

‎graphql-kotlin-toolkit-codegen/src/main/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/pagination/PaginationEdgeGenerator.kt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ internal class PaginationEdgeGenerator(
3030

3131
return TypeSpec.classBuilder(fileClassName)
3232
.addTypeVariable(typeVariable)
33-
.primaryConstructor(FunSpec.constructorBuilder()
34-
.addParameter("node", typeVariable)
35-
.addParameter("cursor", cursorType)
36-
.build())
33+
.primaryConstructor(
34+
FunSpec.constructorBuilder()
35+
.addParameter("node", typeVariable)
36+
.addParameter("cursor", cursorType)
37+
.build()
38+
)
3739
.addProperty(PropertySpec.builder("node", typeVariable).initializer("node").build())
3840
.addProperty(PropertySpec.builder("cursor", cursorType).initializer("cursor").build())
3941
.build()

‎graphql-kotlin-toolkit-codegen/src/test/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/_test/AbstractCompilationTest.kt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,17 @@ abstract class AbstractCompilationTest(
7070

7171
return TypeSpec.classBuilder(spec.name!! + "Mock")
7272
.addSuperinterface(classToMock)
73-
.addFunctions(spec.funSpecs
74-
.filter { KModifier.ABSTRACT in it.modifiers }
75-
.map {
76-
it.toBuilder()
77-
.addModifiers(KModifier.OVERRIDE)
78-
.addCode("TODO()")
79-
.also { t -> t.modifiers.remove(KModifier.ABSTRACT) }
80-
.build()
81-
}).build()
73+
.addFunctions(
74+
spec.funSpecs
75+
.filter { KModifier.ABSTRACT in it.modifiers }
76+
.map {
77+
it.toBuilder()
78+
.addModifiers(KModifier.OVERRIDE)
79+
.addCode("TODO()")
80+
.also { t -> t.modifiers.remove(KModifier.ABSTRACT) }
81+
.build()
82+
}
83+
).build()
8284
}
8385

8486
data class Result(

‎graphql-kotlin-toolkit-codegen/src/test/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/codeblock/ArgumentCodeBlockGeneratorTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import com.squareup.kotlinpoet.FileSpec
66
import com.squareup.kotlinpoet.FunSpec
77
import com.squareup.kotlinpoet.TypeSpec
88
import graphql.Scalars
9+
import org.junit.jupiter.api.Assertions
10+
import org.junit.jupiter.api.Test
911
import kotlin.reflect.full.declaredFunctions
1012
import kotlin.reflect.full.functions
1113
import kotlin.reflect.jvm.isAccessible
12-
import org.junit.jupiter.api.Assertions
13-
import org.junit.jupiter.api.Test
1414

1515
internal class ArgumentCodeBlockGeneratorTest : AbstractCompilationTest() {
1616

‎graphql-kotlin-toolkit-codegen/src/test/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/EnumGeneratorTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import graphql.Scalars
88
import graphql.schema.GraphQLArgument
99
import graphql.schema.GraphQLDirective
1010
import graphql.schema.GraphQLEnumType
11+
import org.junit.jupiter.api.Assertions
12+
import org.junit.jupiter.api.Test
1113
import java.lang.reflect.InvocationTargetException
1214
import kotlin.reflect.full.companionObject
1315
import kotlin.reflect.full.companionObjectInstance
1416
import kotlin.reflect.full.declaredMemberFunctions
1517
import kotlin.reflect.full.declaredMemberProperties
1618
import kotlin.reflect.full.isSubclassOf
17-
import org.junit.jupiter.api.Assertions
18-
import org.junit.jupiter.api.Test
1919

2020
internal class EnumGeneratorTest : AbstractCompilationTest() {
2121
@Test

‎graphql-kotlin-toolkit-codegen/src/test/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/InputObjectGeneratorTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import graphql.Scalars
66
import graphql.schema.GraphQLInputObjectField
77
import graphql.schema.GraphQLInputObjectType
88
import graphql.schema.GraphQLNonNull
9+
import org.junit.jupiter.api.Assertions
10+
import org.junit.jupiter.api.BeforeAll
11+
import org.junit.jupiter.api.Test
12+
import org.junit.jupiter.api.TestInstance
913
import kotlin.reflect.KClass
1014
import kotlin.reflect.full.companionObject
1115
import kotlin.reflect.full.memberFunctions
1216
import kotlin.reflect.full.memberProperties
1317
import kotlin.reflect.full.starProjectedType
14-
import org.junit.jupiter.api.Assertions
15-
import org.junit.jupiter.api.BeforeAll
16-
import org.junit.jupiter.api.Test
17-
import org.junit.jupiter.api.TestInstance
1818

1919
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2020
internal class InputObjectGeneratorTest : AbstractCompilationTest() {

‎graphql-kotlin-toolkit-codegen/src/test/kotlin/com/auritylab/graphql/kotlin/toolkit/codegen/generator/ObjectTypeGeneratorTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import com.auritylab.graphql.kotlin.toolkit.codegen._test.TestObject
55
import graphql.Scalars
66
import graphql.schema.GraphQLFieldDefinition
77
import graphql.schema.GraphQLObjectType
8-
import kotlin.reflect.KClass
9-
import kotlin.reflect.full.memberProperties
108
import org.junit.jupiter.api.Assertions
119
import org.junit.jupiter.api.BeforeAll
1210
import org.junit.jupiter.api.Test
1311
import org.junit.jupiter.api.TestInstance
12+
import kotlin.reflect.KClass
13+
import kotlin.reflect.full.memberProperties
1414

1515
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
1616
internal class ObjectTypeGeneratorTest : AbstractCompilationTest() {

0 commit comments

Comments
 (0)