Stable release

Author: reactivestudio

README.md

@@ -31,9 +31,9 @@ plugins {
 }
 
 dependencies { 
-	implementation("pro.vlprojects:convertible-core:0.0.2")
-	implementation("pro.vlprojects:convertible-jpa:0.0.2") // or other scopes
-	ksp("pro.vlprojects:convertible-core:0.0.2")
+	implementation("pro.vlprojects:convertible-core:0.1.0")
+	implementation("pro.vlprojects:convertible-jpa:0.1.0") // or other scopes
+	ksp("pro.vlprojects:convertible-jpa:0.1.0")
 }
 ```
 

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

@@ -41,12 +41,11 @@ class ConvertibleProcessor(
 	override fun finish() = definitions
 		.also { logger.info("${it.size} definitions found for code generating") }
 		.forEach { definition ->
-			logger.info("Processing definition: $definition")
-			val targetPackage = "${definition.objectClassName.packageName}.${definition.scope.lowercase()}"
-
 			check(strategy.supports(definition)) { "The strategy does not support the definition: $definition" }
 
+			val targetPackage = "${definition.objectClassName.packageName}.${definition.scope.lowercase()}"
 			val specification = strategy.build(definition)
+
 			specification.writeWith(generator, targetPackage, definition.source)
 			logger.info("Generated file: $targetPackage.${specification.name}")
 		}

convertible-jpa/src/main/kotlin/pro/vlprojects/convertible/jpa/JpaAttributeConverter.kt

@@ -21,25 +21,18 @@ class JpaAttributeConverter : ConvertibleStrategy {
 
 	override fun build(definition: ConvertibleDefinition): FileSpec {
 
-		val scope = Scope.JPA
-		val packageName = "${definition.objectClassName.packageName}.$scope"
-		val fileName = "${definition.objectClassName.simpleName}Converter"
+		val fileName = "${definition.objectClassName.simpleName}JpaConverter"
 		val nullable = definition.nullable
 		val objectType = definition.objectClassName.copy(nullable = nullable)
 		val primitiveType = definition.valueAccessor.returnType.copy(nullable = nullable)
 
 		return FileSpec
-			.builder(packageName = packageName, fileName = fileName)
+			.builder(packageName = definition.objectClassName.packageName, fileName = fileName)
 			.addType(
 				TypeSpec
 					.classBuilder(fileName)
 					.addModifiers()
-					.addAnnotation(
-						AnnotationSpec
-							.builder(Component::class)
-							.addMember("value = \"%L\"", "$scope.$fileName")
-							.build()
-					)
+					.addAnnotation(Component::class)
 					.addAnnotation(
 						AnnotationSpec
 							.builder(Converter::class)

convertible-jpa/src/test/kotlin/pro/vlprojects/convertible/jpa/JpaAttributeConverterTests.kt

@@ -65,61 +65,61 @@ class JpaAttributeConverterTests {
 			Arguments.of(
 				Named.of(
 					"Fallback value. Fallback factory",
-					TestCase("FallbackAll.kt", "FallbackAllConverter.kt"),
+					TestCase("FallbackAll.kt", "FallbackAllJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Nullable. Fallback value. Fallback factory",
-					TestCase("NullableFallbackAll.kt", "NullableFallbackAllConverter.kt"),
+					TestCase("NullableFallbackAll.kt", "NullableFallbackAllJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Fallback value. Factory declared",
-					TestCase("FallbackValue.kt", "FallbackValueConverter.kt"),
+					TestCase("FallbackValue.kt", "FallbackValueJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Nullable. Fallback value. Factory declared",
-					TestCase("NullableFallbackValue.kt", "NullableFallbackValueConverter.kt"),
+					TestCase("NullableFallbackValue.kt", "NullableFallbackValueJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Fallback factory. Value declared",
-					TestCase("FallbackFactory.kt", "FallbackFactoryConverter.kt"),
+					TestCase("FallbackFactory.kt", "FallbackFactoryJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Nullable. Fallback factory. Value declared",
-					TestCase("NullableFallbackFactory.kt", "NullableFallbackFactoryConverter.kt"),
+					TestCase("NullableFallbackFactory.kt", "NullableFallbackFactoryJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Factory declared. Value declared",
-					TestCase("DeclaredAll.kt", "DeclaredAllConverter.kt"),
+					TestCase("DeclaredAll.kt", "DeclaredAllJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Nullable. Factory declared. Value declared",
-					TestCase("NullableDeclaredAll.kt", "NullableDeclaredAllConverter.kt"),
+					TestCase("NullableDeclaredAll.kt", "NullableDeclaredAllJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Enum. Factory declared. Value declared via method",
-					TestCase("EnumExample.kt", "EnumExampleConverter.kt"),
+					TestCase("EnumExample.kt", "EnumExampleJpaConverter.kt"),
 				)
 			),
 			Arguments.of(
 				Named.of(
 					"Nullable. Enum. Factory declared. Value declared via method",
-					TestCase("NullableEnumExample.kt", "NullableEnumExampleConverter.kt"),
+					TestCase("NullableEnumExample.kt", "NullableEnumExampleJpaConverter.kt"),
 				)
 			),
 		)

convertible-jpa/src/test/resources/converter/DeclaredAllConverter.kt renamed to convertible-jpa/src/test/resources/converter/DeclaredAllJpaConverter.kt

@@ -1,14 +1,13 @@
-package com.example.vo.jpa
+package com.example.vo
 
-import com.example.vo.DeclaredAll
 import jakarta.persistence.AttributeConverter
 import jakarta.persistence.Converter
 import kotlin.String
 import org.springframework.stereotype.Component
 
-@Component(value = "jpa.DeclaredAllConverter")
+@Component
 @Converter(autoApply = true)
-public class DeclaredAllConverter : AttributeConverter<DeclaredAll, String> {
+public class DeclaredAllJpaConverter : AttributeConverter<DeclaredAll, String> {
   override fun convertToDatabaseColumn(attribute: DeclaredAll): String = attribute.value
 
   override fun convertToEntityAttribute(source: String): DeclaredAll = source.let(DeclaredAll::from)

convertible-jpa/src/test/resources/converter/EnumExampleConverter.kt renamed to convertible-jpa/src/test/resources/converter/EnumExampleJpaConverter.kt

@@ -1,14 +1,13 @@
-package com.example.vo.jpa
+package com.example.vo
 
-import com.example.vo.EnumExample
 import jakarta.persistence.AttributeConverter
 import jakarta.persistence.Converter
 import kotlin.String
 import org.springframework.stereotype.Component
 
-@Component(value = "jpa.EnumExampleConverter")
+@Component
 @Converter(autoApply = true)
-public class EnumExampleConverter : AttributeConverter<EnumExample, String> {
+public class EnumExampleJpaConverter : AttributeConverter<EnumExample, String> {
   override fun convertToDatabaseColumn(attribute: EnumExample): String = attribute.getValue()
 
   override fun convertToEntityAttribute(source: String): EnumExample = source.let(EnumExample::from)

convertible-jpa/src/test/resources/converter/FallbackAllConverter.kt renamed to convertible-jpa/src/test/resources/converter/FallbackAllJpaConverter.kt

@@ -1,14 +1,13 @@
-package com.example.vo.jpa
+package com.example.vo
 
-import com.example.vo.FallbackAll
 import jakarta.persistence.AttributeConverter
 import jakarta.persistence.Converter
 import java.util.UUID
 import org.springframework.stereotype.Component
 
-@Component(value = "jpa.FallbackAllConverter")
+@Component
 @Converter(autoApply = true)
-public class FallbackAllConverter : AttributeConverter<FallbackAll, UUID> {
+public class FallbackAllJpaConverter : AttributeConverter<FallbackAll, UUID> {
   override fun convertToDatabaseColumn(attribute: FallbackAll): UUID = attribute.raw
 
   override fun convertToEntityAttribute(source: UUID): FallbackAll = source.let(::FallbackAll)

convertible-jpa/src/test/resources/converter/FallbackFactoryConverter.kt renamed to convertible-jpa/src/test/resources/converter/FallbackFactoryJpaConverter.kt

@@ -1,14 +1,13 @@
-package com.example.vo.jpa
+package com.example.vo
 
-import com.example.vo.FallbackFactory
 import jakarta.persistence.AttributeConverter
 import jakarta.persistence.Converter
 import kotlin.String
 import org.springframework.stereotype.Component
 
-@Component(value = "jpa.FallbackFactoryConverter")
+@Component
 @Converter(autoApply = true)
-public class FallbackFactoryConverter : AttributeConverter<FallbackFactory, String> {
+public class FallbackFactoryJpaConverter : AttributeConverter<FallbackFactory, String> {
   override fun convertToDatabaseColumn(attribute: FallbackFactory): String = attribute.value
 
   override fun convertToEntityAttribute(source: String): FallbackFactory = source.let(::FallbackFactory)

convertible-jpa/src/test/resources/converter/FallbackValueConverter.kt renamed to convertible-jpa/src/test/resources/converter/FallbackValueJpaConverter.kt

@@ -1,14 +1,13 @@
-package com.example.vo.jpa
+package com.example.vo
 
-import com.example.vo.FallbackValue
 import jakarta.persistence.AttributeConverter
 import jakarta.persistence.Converter
 import java.util.UUID
 import org.springframework.stereotype.Component
 
-@Component(value = "jpa.FallbackValueConverter")
+@Component
 @Converter(autoApply = true)
-public class FallbackValueConverter : AttributeConverter<FallbackValue, UUID> {
+public class FallbackValueJpaConverter : AttributeConverter<FallbackValue, UUID> {
   override fun convertToDatabaseColumn(attribute: FallbackValue): UUID = attribute.raw
 
   override fun convertToEntityAttribute(source: UUID): FallbackValue = source.let(FallbackValue::from)

convertible-jpa/src/test/resources/converter/NullableDeclaredAllConverter.kt renamed to convertible-jpa/src/test/resources/converter/NullableDeclaredAllJpaConverter.kt

@@ -1,14 +1,13 @@
-package com.example.vo.jpa
+package com.example.vo
 
-import com.example.vo.NullableDeclaredAll
 import jakarta.persistence.AttributeConverter
 import jakarta.persistence.Converter
 import kotlin.String
 import org.springframework.stereotype.Component
 
-@Component(value = "jpa.NullableDeclaredAllConverter")
+@Component
 @Converter(autoApply = true)
-public class NullableDeclaredAllConverter : AttributeConverter<NullableDeclaredAll?, String?> {
+public class NullableDeclaredAllJpaConverter : AttributeConverter<NullableDeclaredAll?, String?> {
   override fun convertToDatabaseColumn(attribute: NullableDeclaredAll?): String? = attribute?.value
 
   override fun convertToEntityAttribute(source: String?): NullableDeclaredAll? = source?.let(NullableDeclaredAll::from)