Persist now also sets id to null in case of non-primitive id

Also tested now persist method.

Author: kurbaniec

bee.persistent.test/datasource.a/src/main/kotlin/com/beeproduced/datasource/a/Entities.kt

@@ -183,6 +183,9 @@ data class GeneratedObjectId(
     val id: UUID = UUID.randomUUID()
 )
 
+@BeeRepository
+interface GeneratedObjectIdRepository : BeeBlazeRepository<GeneratedObjectId, UUID>
+
 @Entity
 data class GeneratedPrimitiveId(
     @GeneratedValue

bee.persistent.test/src/test/kotlin/com/beeproduced/bee/persistent/test/BeePersistentTestA.kt

@@ -49,6 +49,10 @@ class BeePersistentTestA(
     val circularRepository: CircularRepository,
     @Autowired
     val semiCircular1Repository: SemiCircular1Repository,
+    @Autowired
+    val generatedObjectIdRepository: GeneratedObjectIdRepository,
+    @Autowired
+    val generatedPrimitiveIdRepository: GeneratedPrimitiveIdRepository
 ) {
     private val transaction = TransactionTemplate(transactionManager)
 
@@ -727,6 +731,31 @@ class BeePersistentTestA(
         }
     }
 
+
+    @Test
+    fun `test persist`() {
+        transaction.executeWithoutResult {
+            val objectId = GeneratedObjectId()
+            val pstObjectId = generatedObjectIdRepository.persist(objectId)
+            assertNotNull(pstObjectId.id)
+
+            val primitiveId = GeneratedPrimitiveId()
+            val pstPrimitiveId = generatedPrimitiveIdRepository.persist(primitiveId)
+            assertNotNull(pstPrimitiveId.id)
+
+            val primitiveId2 = GeneratedPrimitiveId().copy(id = -42)
+            val pstPrimitiveId2 = generatedPrimitiveIdRepository.persist(primitiveId2)
+            assertNotNull(pstPrimitiveId2.id)
+
+            val default = GeneratedPrimitiveId::class.java
+                .getConstructor()
+                .newInstance()
+            val primitiveId3 = GeneratedPrimitiveId().copy(id = -42)
+            val pstPrimitiveId3 = generatedPrimitiveIdRepository.persist(primitiveId3.copy(id = default.id))
+            assertNotNull(pstPrimitiveId3.id)
+        }
+    }
+
     @BeforeAll
     fun beforeAll() {
         clear()

bee.persistent/src/blaze-processor/kotlin/com/beeproduced/bee/persistent/blaze/processor/codegen/BeePersistentBuilderCodegen.kt

@@ -7,6 +7,7 @@ import com.beeproduced.bee.persistent.blaze.processor.FullyQualifiedName
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentBuilderCodegen.PoetConstants.BUILDER
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentBuilderCodegen.PoetConstants.CLAZZ
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentBuilderCodegen.PoetConstants.FIELD
+import com.beeproduced.bee.persistent.blaze.processor.info.AbstractProperty
 import com.beeproduced.bee.persistent.blaze.processor.info.EntityInfo
 import com.beeproduced.bee.persistent.blaze.processor.info.EntityProperty
 import com.beeproduced.bee.persistent.blaze.processor.info.RepoInfo
@@ -85,15 +86,19 @@ class BeePersistentBuilderCodegen(
 
     private fun FileSpec.Builder.buildInfo(entity: EntityInfo) = apply {
         val access = entity.accessInfo(false)
-        if (access.reflectionProps.isEmpty()) return@apply
+        val hasPrimitiveId = entity.hasPrimitiveId()
+        if (access.reflectionProps.isEmpty() && hasPrimitiveId) return@apply
 
         val infoObj = TypeSpec.objectBuilder(entity.infoName())
         val entityClassName = entity.declaration.toClassName()
-        for (property in access.reflectionProps) {
+
+        val properties = access.reflectionProps + entity.id
+
+        for (property in properties) {
             val reflectionField = PropertySpec
                 .builder(property.infoField(), poetMap.classMapping(FIELD))
                 .initializer(
-                    "%T::class.java.getDeclaredField(\"${property.simpleName}\").apply { isAccessible = true }",
+                    "%T::class.java.getDeclaredField(\"${property.simpleName}\").apply·{·isAccessible·=·true·}",
                     entityClassName
                 )
             infoObj.addProperty(reflectionField.build())
@@ -166,10 +171,24 @@ class BeePersistentBuilderCodegen(
 
     companion object {
         fun EntityInfo.builderName(): String = "${uniqueName}Builder"
-    }
-
-    private fun EntityInfo.infoName(): String = "${uniqueName}BuilderInfo"
-
-    private fun EntityProperty.infoField(): String = "${simpleName}Field"
 
+        fun EntityInfo.infoName(): String = "${uniqueName}BuilderInfo"
+
+        fun AbstractProperty.infoField(): String = "${simpleName}Field"
+
+        fun EntityInfo.hasPrimitiveId(): Boolean {
+            val type = id.type
+            if (type.isMarkedNullable) return false
+            val typeName = type.declaration.simpleName.asString()
+            return when (typeName) {
+                "Double" -> true
+                "Float" -> true
+                "Long" -> true
+                "Int", "Short", "Byte" -> true
+                "Boolean" -> true
+                "Char" -> true
+                else -> false
+            }
+        }
+    }
 }

bee.persistent/src/blaze-processor/kotlin/com/beeproduced/bee/persistent/blaze/processor/codegen/BeePersistentRepoCodegen.kt

@@ -6,6 +6,8 @@ import com.beeproduced.bee.generative.util.toPoetClassName
 import com.beeproduced.bee.persistent.blaze.processor.FullyQualifiedName
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentAnalyser.Companion.viewName
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentBuilderCodegen.Companion.builderName
+import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentBuilderCodegen.Companion.infoField
+import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentBuilderCodegen.Companion.infoName
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentRepoCodegen.PoetConstants.AUTOWIRED
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentRepoCodegen.PoetConstants.BEE_SELECTION
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentRepoCodegen.PoetConstants.CLAZZ
@@ -32,6 +34,7 @@ import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentRepoC
 import com.beeproduced.bee.persistent.blaze.processor.codegen.BeePersistentRepoCodegen.PoetConstants.__SELECTION_INFO_NAME
 import com.beeproduced.bee.persistent.blaze.processor.info.*
 import com.beeproduced.bee.persistent.blaze.processor.utils.accessInfo
+import com.beeproduced.bee.persistent.blaze.processor.utils.reflectionSetterName
 import com.beeproduced.bee.persistent.blaze.processor.utils.viewLazyColumnsWithSubclasses
 import com.google.devtools.ksp.processing.CodeGenerator
 import com.google.devtools.ksp.processing.Dependencies
@@ -293,8 +296,15 @@ class BeePersistentRepoCodegen(
         idLiteral: String,
         padding: String = ""
     ) = apply {
-        val idAssignment = if (idLiteral.isEmpty()) "" else "${e.id.simpleName}=$idLiteral"
+        val idAssignment = if (idLiteral.startsWith("default.")) "${e.id.simpleName}=$idLiteral" else ""
         addNamedStmt("${padding}val e = entity.$_BEE_CLONE_FN { $idAssignment }")
+        // TODO: Integrate into builder breaking nullability rules?
+        if (idLiteral == "null") {
+            val infoObjName = e.infoName()
+            val infoField = e.id.infoField()
+            val infoObjClass = ClassName(config.builderPackageName, infoObjName)
+            addStatement("${padding}%T.${infoField}.set(e, null)", infoObjClass)
+        }
         addNamedStmt("${padding}em.persist(e)")
         addNamedStmt("${padding}em.flush()")
         addNamedStmt("${padding}em.clear()")