Skip to content

Commit a7d5969

Browse files
Folder changes only
1 parent 0657ef8 commit a7d5969

File tree

15 files changed

+40
-23
lines changed

15 files changed

+40
-23
lines changed

ksp-annotations/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

ksp-processor/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

ksp/core-annotations/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../ksp-annotations/build

ksp/core-processor/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../ksp-processor/build

ksp-processor/build.gradle.kts renamed to ksp/core-processor/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kotlin {
1111
jvmMain {
1212
dependencies {
1313
implementation(projects.core)
14-
implementation(projects.kspAnnotations)
14+
implementation(projects.ksp.coreAnnotations)
1515
implementation(libs.kotlin.poet)
1616
implementation(libs.kotlin.poet.ksp)
1717
implementation(libs.ksp.api)

ksp-processor/jvm/src/dev/programadorthi/routing/ksp/RoutingProcessor.kt renamed to ksp/core-processor/jvm/src/dev/programadorthi/routing/ksp/RoutingProcessor.kt

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.google.devtools.ksp.getVisibility
77
import com.google.devtools.ksp.processing.CodeGenerator
88
import com.google.devtools.ksp.processing.Dependencies
99
import com.google.devtools.ksp.processing.KSBuiltIns
10-
import com.google.devtools.ksp.processing.KSPLogger
1110
import com.google.devtools.ksp.processing.Resolver
1211
import com.google.devtools.ksp.processing.SymbolProcessor
1312
import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
@@ -31,16 +30,12 @@ import dev.programadorthi.routing.annotation.Route
3130

3231
public class RoutingProcessorProvider : SymbolProcessorProvider {
3332
override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
34-
return RoutingProcessor(
35-
codeGenerator = environment.codeGenerator,
36-
logger = environment.logger
37-
)
33+
return RoutingProcessor(codeGenerator = environment.codeGenerator)
3834
}
3935
}
4036

4137
private class RoutingProcessor(
4238
private val codeGenerator: CodeGenerator,
43-
private val logger: KSPLogger
4439
) : SymbolProcessor {
4540
private var invoked = false
4641

@@ -99,11 +94,23 @@ private class RoutingProcessor(
9994
if (isRegexRoute) {
10095
if (routeAnnotation.method.isBlank()) {
10196
configureSpec
102-
.beginControlFlow("%M(path = %T(%S))", handle, Regex::class, routeAnnotation.regex)
97+
.beginControlFlow(
98+
"%M(path = %T(%S))",
99+
handle,
100+
Regex::class,
101+
routeAnnotation.regex
102+
)
103103
} else {
104-
val template = """%M(path = %T(%S), method = %M(value = "${routeAnnotation.method}"))"""
104+
val template =
105+
"""%M(path = %T(%S), method = %M(value = "${routeAnnotation.method}"))"""
105106
configureSpec
106-
.beginControlFlow(template, handle, Regex::class, routeAnnotation.regex, routeMethod)
107+
.beginControlFlow(
108+
template,
109+
handle,
110+
Regex::class,
111+
routeAnnotation.regex,
112+
routeMethod
113+
)
107114
}
108115
} else {
109116
val named = when {
@@ -114,7 +121,8 @@ private class RoutingProcessor(
114121
configureSpec
115122
.beginControlFlow("%M(path = %S, $named)", handle, routeAnnotation.path)
116123
} else {
117-
val template = """%M(path = %S, $named, method = %M(value = "${routeAnnotation.method}"))"""
124+
val template =
125+
"""%M(path = %S, $named, method = %M(value = "${routeAnnotation.method}"))"""
118126
configureSpec
119127
.beginControlFlow(template, handle, routeAnnotation.path, routeMethod)
120128
}
@@ -206,7 +214,14 @@ private class RoutingProcessor(
206214
else -> resolver.builtIns.requiredParse(type.resolve())
207215
}
208216
when {
209-
hasZeroOrOneParameter -> builder.add(PATH_TEMPLATE, paramName, call, customName, literal)
217+
hasZeroOrOneParameter -> builder.add(
218+
PATH_TEMPLATE,
219+
paramName,
220+
call,
221+
customName,
222+
literal
223+
)
224+
210225
else -> builder.addStatement(PATH_TEMPLATE, paramName, call, customName, "$literal,")
211226
}
212227
}
@@ -233,9 +248,10 @@ private class RoutingProcessor(
233248
check(paramType.declaration == listDeclaration) {
234249
"TailCard parameter must be a List<String>?"
235250
}
236-
val genericArgument = checkNotNull(type.element?.typeArguments?.firstOrNull()?.type?.resolve()) {
237-
"No <String> type found at tailcard parameter"
238-
}
251+
val genericArgument =
252+
checkNotNull(type.element?.typeArguments?.firstOrNull()?.type?.resolve()) {
253+
"No <String> type found at tailcard parameter"
254+
}
239255
check(genericArgument == resolver.builtIns.stringType) {
240256
"TailCard list item type must be non nullable String"
241257
}
@@ -318,7 +334,8 @@ private class RoutingProcessor(
318334
private val routeMethod = MemberName("dev.programadorthi.routing.core", "RouteMethod")
319335
private val call = MemberName("dev.programadorthi.routing.core.application", "call")
320336
private val receive = MemberName("dev.programadorthi.routing.core.application", "receive")
321-
private val receiveNullable = MemberName("dev.programadorthi.routing.core.application", "receiveNullable")
337+
private val receiveNullable =
338+
MemberName("dev.programadorthi.routing.core.application", "receiveNullable")
322339

323340
private const val BODY_TEMPLATE = "%L = %M.%M()%L"
324341
private const val FUN_INVOKE_END = ")"

samples/ksp-sample/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
dependencies {
77
implementation(projects.core)
8-
implementation(projects.kspAnnotations)
9-
implementation(projects.kspProcessor)
10-
ksp(projects.kspProcessor)
8+
implementation(projects.ksp.coreAnnotations)
9+
implementation(projects.ksp.coreProcessor)
10+
ksp(projects.ksp.coreProcessor)
1111
}

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ include(":call-logging")
2525
include(":core")
2626
include(":events")
2727
include(":events-resources")
28-
include(":ksp-annotations")
29-
include(":ksp-processor")
28+
include(":ksp:core-annotations")
29+
include(":ksp:core-processor")
3030
include(":resources")
3131
include(":sessions")
3232
include(":status-pages")

0 commit comments

Comments
 (0)