Annotation-generator : Separate annotations from annotation processing

delphes99 · delphes99 · commit a12fe6c4796a · 2024-08-11T11:21:22.000+02:00
diff --git a/annotation-generator/src/main/kotlin/fr/delphes/generation/serialization/PolymorphicSerializerModuleProcessor.kt b/annotation-generator/src/main/kotlin/fr/delphes/generation/serialization/PolymorphicSerializerModuleProcessor.kt
@@ -1,4 +1,4 @@
-package fr.delphes.annotation.serialization
+package fr.delphes.generation.serialization
 
 import com.google.devtools.ksp.processing.CodeGenerator
 import com.google.devtools.ksp.processing.KSPLogger
diff --git a/annotation-generator/src/main/kotlin/fr/delphes/generation/serialization/RegisterPolymorphic.kt b/annotation-generator/src/main/kotlin/fr/delphes/generation/serialization/RegisterPolymorphic.kt
@@ -1,4 +1,4 @@
-package fr.delphes.annotation.serialization
+package fr.delphes.generation.serialization
 
 import kotlin.reflect.KClass
 
diff --git a/annotation-generator/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/annotation-generator/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -1,3 +1,3 @@
 fr.delphes.generation.dynamicForm.generateFormProcessor.GenerateDynamicFormProcessorProvider
 fr.delphes.generation.dynamicForm.generateRegistryProcessor.GenerateRegistryProcessorProvider
-fr.delphes.annotation.serialization.PolymorphicSerializerModuleProcessorProvider
+fr.delphes.generation.serialization.PolymorphicSerializerModuleProcessorProvider
diff --git a/annotation-generator/src/test/kotlin/fr/delphes/generation/dynamicForm/metadata/CustomFieldTypeMapper.kt b/annotation-generator/src/test/kotlin/fr/delphes/generation/dynamicForm/metadata/CustomFieldTypeMapper.kt
@@ -1,6 +1,6 @@
 package fr.delphes.generation.dynamicForm.metadata
 
-import fr.delphes.generation.dynamicForm.FieldDescriptorMapper
+import fr.delphes.annotation.dynamicForm.FieldDescriptorMapper
 
 object CustomFieldTypeMapper : FieldDescriptorMapper<CustomFieldType> {
     override fun mapFromDto(value: String): CustomFieldType {
diff --git a/annotation-generator/src/test/kotlin/fr/delphes/generation/dynamicForm/metadata/DurationFixedTypeMapper.kt b/annotation-generator/src/test/kotlin/fr/delphes/generation/dynamicForm/metadata/DurationFixedTypeMapper.kt
@@ -1,6 +1,6 @@
 package fr.delphes.generation.dynamicForm.metadata
 
-import fr.delphes.generation.dynamicForm.FieldDescriptorMapper
+import fr.delphes.annotation.dynamicForm.FieldDescriptorMapper
 import java.time.Duration
 
 object DurationFixedTypeMapper : FieldDescriptorMapper<Duration> {
diff --git a/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/FieldDescription.kt b/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/FieldDescription.kt
diff --git a/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/FieldDescriptorMapper.kt b/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/FieldDescriptorMapper.kt
@@ -1,4 +1,4 @@
-package fr.delphes.generation.dynamicForm
+package fr.delphes.annotation.dynamicForm
 
 interface FieldDescriptorMapper<T> {
     fun mapFromDto(value: String): T
diff --git a/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/FieldMapper.kt b/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/FieldMapper.kt
@@ -1,6 +1,5 @@
 package fr.delphes.annotation.dynamicForm
 
-import fr.delphes.generation.dynamicForm.FieldDescriptorMapper
 import kotlin.reflect.KClass
 
 @Target(AnnotationTarget.FIELD)
diff --git a/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/RegisterDynamicFormDto.kt b/annotation/src/main/kotlin/fr/delphes/annotation/dynamicForm/RegisterDynamicFormDto.kt
diff --git a/annotation/src/main/kotlin/fr/delphes/annotation/incomingEvent/RegisterIncomingEvent.kt b/annotation/src/main/kotlin/fr/delphes/annotation/incomingEvent/RegisterIncomingEvent.kt
diff --git a/connector-discord/build.gradle.kts b/connector-discord/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     implementation(project(":bot-core"))
     implementation(libs.ktor.server.core)
     implementation(libs.kord)
-    implementation(project(":annotation-generator"))
+    implementation(project(":annotation"))
     ksp(project(":annotation-generator"))
 }
 
diff --git a/connector-obs/build.gradle.kts b/connector-obs/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     implementation(project(":bot-core"))
     implementation(project(":obs-client"))
     implementation(libs.ktor.server.core)
-    implementation(project(":annotation-generator"))
+    implementation(project(":annotation"))
     ksp(project(":annotation-generator"))
 }
 
diff --git a/connector-twitch/build.gradle.kts b/connector-twitch/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
     testImplementation(libs.bundles.kotlin.test)
     testImplementation(project(":utils-test"))
     implementation(project(":annotation"))
-    implementation(project(":annotation-generator"))
     ksp(project(":annotation-generator"))
 }
 
diff --git a/connector-twitch/src/main/kotlin/fr/delphes/connector/twitch/outgoingEvent/descriptionMapper/ChannelRewardIdMapper.kt b/connector-twitch/src/main/kotlin/fr/delphes/connector/twitch/outgoingEvent/descriptionMapper/ChannelRewardIdMapper.kt
@@ -1,8 +1,8 @@
 package fr.delphes.connector.twitch.outgoingEvent.descriptionMapper
 
+import fr.delphes.annotation.dynamicForm.FieldDescriptorMapper
 import fr.delphes.connector.twitch.reward.RewardId
 import fr.delphes.connector.twitch.reward.RewardTitle
-import fr.delphes.generation.dynamicForm.FieldDescriptorMapper
 import fr.delphes.twitch.TwitchChannel
 
 object ChannelRewardIdMapper : FieldDescriptorMapper<RewardId> {
diff --git a/connector-twitch/src/main/kotlin/fr/delphes/connector/twitch/outgoingEvent/descriptionMapper/TwitchChannelMapper.kt b/connector-twitch/src/main/kotlin/fr/delphes/connector/twitch/outgoingEvent/descriptionMapper/TwitchChannelMapper.kt
@@ -1,6 +1,6 @@
 package fr.delphes.connector.twitch.outgoingEvent.descriptionMapper
 
-import fr.delphes.generation.dynamicForm.FieldDescriptorMapper
+import fr.delphes.annotation.dynamicForm.FieldDescriptorMapper
 import fr.delphes.twitch.TwitchChannel
 
 object TwitchChannelMapper : FieldDescriptorMapper<TwitchChannel> {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package fr.delphes.annotation.serialization`
	`1`	`+package fr.delphes.generation.serialization`
`2`	`2`
`3`	`3`	`import com.google.devtools.ksp.processing.CodeGenerator`
`4`	`4`	`import com.google.devtools.ksp.processing.KSPLogger`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package fr.delphes.generation.dynamicForm`
	`1`	`+package fr.delphes.annotation.dynamicForm`
`2`	`2`
`3`	`3`	`interface FieldDescriptorMapper<T> {`
`4`	`4`	`fun mapFromDto(value: String): T`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ dependencies {`
`10`	`10`	`implementation(project(":bot-core"))`
`11`	`11`	`implementation(libs.ktor.server.core)`
`12`	`12`	`implementation(libs.kord)`
`13`		`- implementation(project(":annotation-generator"))`
	`13`	`+ implementation(project(":annotation"))`
`14`	`14`	`ksp(project(":annotation-generator"))`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ dependencies {`
`14`	`14`	`testImplementation(libs.bundles.kotlin.test)`
`15`	`15`	`testImplementation(project(":utils-test"))`
`16`	`16`	`implementation(project(":annotation"))`
`17`		`- implementation(project(":annotation-generator"))`
`18`	`17`	`ksp(project(":annotation-generator"))`
`19`	`18`	`}`
`20`	`19`