Refactor

Author: reactivestudio

convertible-core/src/main/kotlin/pro/vlprojects/convertible/core/processor/ConvertibleProcessor.kt

@@ -12,22 +12,20 @@ import com.google.devtools.ksp.validate
 import com.squareup.kotlinpoet.FileSpec
 import pro.vlprojects.convertible.core.annotation.Convertible
 import pro.vlprojects.convertible.core.definition.ConvertibleDefinition
-import pro.vlprojects.convertible.core.strategy.ConvertibleStrategyLoader
+import pro.vlprojects.convertible.core.strategy.ConvertibleStrategy
 import java.io.OutputStreamWriter
 
 class ConvertibleProcessor(
+	private val strategy: ConvertibleStrategy,
 	private val generator: CodeGenerator,
 	private val logger: KSPLogger,
 ) : SymbolProcessor {
 
-	private val strategies = ConvertibleStrategyLoader(logger)
-		.load()
-		.also { logger.info("${it.size} strategies found for code generating") }
-
 	private val definitions = mutableListOf<ConvertibleDefinition>()
-	private val visitor = ConvertibleVisitor(definitions)
 
 	override fun process(resolver: Resolver): List<KSAnnotated> {
+		val visitor = ConvertibleVisitor(strategy.scope(), definitions)
+
 		resolver
 			.getSymbolsWithAnnotation(Convertible::class.qualifiedName!!)
 			.filterIsInstance<KSClassDeclaration>()
@@ -45,16 +43,15 @@ class ConvertibleProcessor(
 		.forEach { definition ->
 			logger.info("Processing definition: $definition")
 			val targetPackage = "${definition.objectClassName.packageName}.${definition.scope.lowercase()}"
-			strategies
-				.filter { it.supports(definition) }
-				.forEach { strategy ->
-					val specification = strategy.build(definition)
-					logger.info("Generating file: $targetPackage.${specification.name}")
-					specification.writeWith(generator, targetPackage, definition.source)
-					logger.info("Generated file: $targetPackage.${specification.name}")
-				}
+
+			check(strategy.supports(definition)) { "The strategy does not support the definition: $definition" }
+
+			val specification = strategy.build(definition)
+			specification.writeWith(generator, targetPackage, definition.source)
+			logger.info("Generated file: $targetPackage.${specification.name}")
 		}
 
+
 	override fun onError() {
 		super.onError()
 		logger.error("Failed to process @Convertible")

convertible-core/src/main/kotlin/pro/vlprojects/convertible/core/processor/ConvertibleProcessorProvider.kt

@@ -19,6 +19,7 @@ import pro.vlprojects.convertible.core.definition.ConvertibleDefinition.ValueAcc
 import kotlin.reflect.KClass
 
 class ConvertibleVisitor(
+	private val scope: String,
 	private val definitions: MutableList<ConvertibleDefinition>,
 ) : KSVisitorVoid() {
 
@@ -36,23 +37,21 @@ class ConvertibleVisitor(
 			val nullable = annotation.getArgument<Boolean>("nullable").let(::checkNotNull)
 			val scopes = annotation.getScopes()
 
-			check(scopes.isNotEmpty()) { "At least one scope must be specified for @Convertible in $className" }
+			check(scopes.contains(scope)) { "Scope $scope not specified in @Convertible annotation for class $className" }
 
-			scopes.forEach { scope ->
-				val valueAccessor = resolveValueAccessor(classDeclaration, scope)
-				val factoryAccessor = resolveFactoryAccessor(classDeclaration, valueAccessor.returnType, scope)
+			val valueAccessor = resolveValueAccessor(classDeclaration, scope)
+			val factoryAccessor = resolveFactoryAccessor(classDeclaration, valueAccessor.returnType, scope)
 
-				val definition = ConvertibleDefinition(
-					objectClassName = className,
-					source = classDeclaration.containingFile.let(::checkNotNull),
-					scope = scope,
-					nullable = nullable,
-					valueAccessor = valueAccessor,
-					factoryAccessor = factoryAccessor,
-				)
+			val definition = ConvertibleDefinition(
+				objectClassName = className,
+				source = classDeclaration.containingFile.let(::checkNotNull),
+				scope = scope,
+				nullable = nullable,
+				valueAccessor = valueAccessor,
+				factoryAccessor = factoryAccessor,
+			)
 
-				definitions.add(definition)
-			}
+			definitions.add(definition)
 		}
 	}
 

convertible-core/src/main/kotlin/pro/vlprojects/convertible/core/processor/ConvertibleVisitor.kt

@@ -4,6 +4,7 @@ import com.squareup.kotlinpoet.FileSpec
 import pro.vlprojects.convertible.core.definition.ConvertibleDefinition
 
 interface ConvertibleStrategy {
-	fun supports(definition: ConvertibleDefinition): Boolean
+	fun scope(): String
+	fun supports(definition: ConvertibleDefinition): Boolean = scope() == definition.scope
 	fun build(definition: ConvertibleDefinition): FileSpec
 }

convertible-core/src/main/kotlin/pro/vlprojects/convertible/core/strategy/ConvertibleStrategy.kt

@@ -12,11 +12,12 @@ repositories {
 dependencies {
 	implementation(project(":convertible-core"))
 
+	implementation("com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.1")
+	implementation("com.squareup:kotlinpoet:2.2.0")
+
 	implementation("jakarta.persistence:jakarta.persistence-api:3.1.0")
 	implementation("org.springframework:spring-context:6.2.6")
 
-	implementation("com.squareup:kotlinpoet:2.2.0")
-
 	testImplementation(kotlin("test"))
 
 	testImplementation("dev.zacsweers.kctfork:core:0.7.1")

convertible-core/src/main/kotlin/pro/vlprojects/convertible/core/strategy/ConvertibleStrategyLoader.kt

@@ -17,7 +17,7 @@ import pro.vlprojects.convertible.core.strategy.ConvertibleStrategy
 
 class JpaAttributeConverter : ConvertibleStrategy {
 
-	override fun supports(definition: ConvertibleDefinition): Boolean = definition.scope == Scope.JPA
+	override fun scope() = Scope.JPA
 
 	override fun build(definition: ConvertibleDefinition): FileSpec {
 

convertible-core/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider

@@ -0,0 +1,13 @@
+package pro.vlprojects.convertible.jpa
+
+import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
+import com.google.devtools.ksp.processing.SymbolProcessorProvider
+import pro.vlprojects.convertible.core.processor.ConvertibleProcessor
+
+class JpaConvertibleProcessorProvider : SymbolProcessorProvider {
+	override fun create(environment: SymbolProcessorEnvironment) = ConvertibleProcessor(
+		strategy = JpaAttributeConverter(),
+		generator = environment.codeGenerator,
+		logger = environment.logger,
+	)
+}

convertible-jpa/build.gradle.kts

@@ -0,0 +1 @@
+pro.vlprojects.convertible.jpa.JpaConvertibleProcessorProvider