added cascading attribute ( delete missing )

coolsamson7 · Sep 24, 2024 · a22596d · a22596d
1 parent 92787f2
commit a22596d
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 96 deletions.
diff --git a/src/main/kotlin/org/sirius/dorm/ObjectManager.kt b/src/main/kotlin/org/sirius/dorm/ObjectManager.kt
@@ -18,6 +18,7 @@ import jakarta.persistence.PersistenceContext
 import org.antlr.v4.runtime.CharStreams
 import org.antlr.v4.runtime.CommonTokenStream
 import org.antlr.v4.runtime.RecognitionException
+import org.sirius.dorm.query.parser.OQLParser
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 import org.springframework.transaction.PlatformTransactionManager
@@ -41,14 +42,14 @@ class ObjectDescriptorBuilder(val manager: ObjectManager, val name: String) {
         return this
     }
 
-    fun relation(name: String, target: String, multiplicity: Multiplicity) : ObjectDescriptorBuilder {
-        properties.add(RelationDescriptor(name, target, multiplicity, null))
+    fun relation(name: String, target: String, multiplicity: Multiplicity, cascade: Cascade? = null) : ObjectDescriptorBuilder {
+        properties.add(RelationDescriptor(name, target, multiplicity, cascade, null))
 
         return this
     }
 
-    fun relation(name: String, target: String, multiplicity: Multiplicity, inverse: String) : ObjectDescriptorBuilder {
-        properties.add(RelationDescriptor(name, target, multiplicity, inverse))
+    fun relation(name: String, target: String, multiplicity: Multiplicity, inverse: String, cascade: Cascade? = null) : ObjectDescriptorBuilder {
+        properties.add(RelationDescriptor(name, target, multiplicity, cascade, inverse))
 
         return this
     }
@@ -125,8 +126,7 @@ class ObjectManager() {
     }
 
     fun delete(obj: DataObject) {
-        if ( obj.state != null)
-            obj.state!!.status = Status.DELETED
+        obj.state?.status = Status.DELETED
     }
 
     // tx
@@ -162,7 +162,7 @@ class ObjectManager() {
     fun <T: Any> query(query: String, resultType: Class<T> = DataObject::class.java as Class<T>) : Query<T> {
         val tokenStream = CommonTokenStream(org.sirius.dorm.query.parser.OQLLexer(CharStreams.fromString(query)))
 
-        val parser = org.sirius.dorm.query.parser.OQLParser(tokenStream)
+        val parser = OQLParser(tokenStream)
 
         parser.setup(queryManager())
         try {

diff --git a/src/main/kotlin/org/sirius/dorm/model/AttributeDescriptor.kt b/src/main/kotlin/org/sirius/dorm/model/AttributeDescriptor.kt
@@ -0,0 +1,43 @@
+package org.sirius.dorm.model
+/*
+ * @COPYRIGHT (C) 2023 Andreas Ernst
+ *
+ * All rights reserved
+ */
+
+import org.sirius.common.type.Type
+import org.sirius.dorm.`object`.Attribute
+import org.sirius.dorm.`object`.DataObject
+import org.sirius.dorm.`object`.Property
+import org.sirius.dorm.persistence.entity.PropertyEntity
+import org.sirius.dorm.transaction.Status
+
+class AttributeDescriptor<T:Any>(name: String, val type: Type<T>, val isPrimaryKey : Boolean = false) : PropertyDescriptor<T>(name) {
+    // public
+
+    fun baseType() : Class<*> {
+        return type.baseType
+    }
+
+    // override
+
+    override fun createProperty(obj: DataObject, status: Status, entity: PropertyEntity?) : Property {
+        return Attribute(entity, defaultValue()!!)
+    }
+
+    override fun asAttribute() : AttributeDescriptor<T> {
+        return this
+    }
+
+    override fun defaultValue() : Any? {
+        return type.defaultValue()
+    }
+
+    override fun validate(value: Any?) {
+        type.validate(value!!)
+    }
+
+    override fun isAttribute() : Boolean {
+        return true
+    }
+}
diff --git a/src/main/kotlin/org/sirius/dorm/model/Cascade.kt b/src/main/kotlin/org/sirius/dorm/model/Cascade.kt
@@ -0,0 +1,10 @@
+package org.sirius.dorm.model
+/*
+ * @COPYRIGHT (C) 2023 Andreas Ernst
+ *
+ * All rights reserved
+ */
+
+enum class Cascade {
+    DELETE
+}
diff --git a/src/main/kotlin/org/sirius/dorm/model/Multiplicity.kt b/src/main/kotlin/org/sirius/dorm/model/Multiplicity.kt
@@ -0,0 +1,12 @@
+package org.sirius.dorm.model
+/*
+ * @COPYRIGHT (C) 2023 Andreas Ernst
+ *
+ * All rights reserved
+ */
+enum class Multiplicity(val optional: Boolean, val mutliValued: Boolean) {
+    ZERO_OR_ONE(true, false),
+    ONE(false, false),
+    MANY(false, true),
+    ZERO_OR_MANY(true, true)
+}
diff --git a/src/main/kotlin/org/sirius/dorm/model/ObjectDescriptorStorage.kt b/src/main/kotlin/org/sirius/dorm/model/ObjectDescriptorStorage.kt
@@ -1,5 +1,4 @@
 package org.sirius.dorm.model
-
 /*
  * @COPYRIGHT (C) 2023 Andreas Ernst
  *

diff --git a/src/main/kotlin/org/sirius/dorm/model/PropertyDescriptor.kt b/src/main/kotlin/org/sirius/dorm/model/PropertyDescriptor.kt
@@ -7,7 +7,6 @@ package org.sirius.dorm.model
 
 import org.sirius.dorm.*
 import org.sirius.dorm.persistence.entity.PropertyEntity
-import org.sirius.common.type.Type
 import org.sirius.dorm.`object`.*
 import org.sirius.dorm.transaction.Status
 
@@ -36,78 +35,4 @@ abstract class PropertyDescriptor<T:Any>(val name: String) {
     }
 }
 
-class AttributeDescriptor<T:Any>(name: String, val type: Type<T>, val isPrimaryKey : Boolean = false) : PropertyDescriptor<T>(name) {
-    // public
 
-    fun baseType() : Class<*> {
-        return type.baseType
-    }
-
-    // override
-
-    override fun createProperty(obj: DataObject, status: Status, entity: PropertyEntity?) : Property {
-        return Attribute(entity, defaultValue()!!)
-    }
-
-    override fun asAttribute() :AttributeDescriptor<T> {
-        return this
-    }
-
-    override fun defaultValue() : Any? {
-        return type.defaultValue()
-    }
-
-    override fun validate(value: Any?) {
-        type.validate(value!!)
-    }
-
-    override fun isAttribute() : Boolean {
-        return true
-    }
-}
-
-
-enum class Multiplicity(val optional: Boolean, val mutliValued: Boolean) {
-    ZERO_OR_ONE(true, false),
-    ONE(false, false),
-    MANY(false, true),
-    ZERO_OR_MANY(true, true)
-}
-open class RelationDescriptor<T:Any>(name: String, val target: String, val multiplicity: Multiplicity, val inverse: String?) : PropertyDescriptor<T>(name) {
-    // instance data
-
-    var targetDescriptor: ObjectDescriptor? = null
-    var inverseRelation : RelationDescriptor<*>? = null
-
-    // override
-
-    override fun createProperty(obj: DataObject, status: Status, entity: PropertyEntity?) : Property {
-        val relation =  if ( multiplicity.mutliValued ) MultiValuedRelation(this, status, obj, entity, targetDescriptor!!) else SingleValuedRelation(this, status, obj, entity, targetDescriptor!!)
-
-        return relation
-    }
-
-    override fun resolve(objectManager: ObjectManager, descriptor: ObjectDescriptor) {
-        targetDescriptor = objectManager.getDescriptor(target)
-        if ( inverse !== null) {
-            inverseRelation = targetDescriptor!!.property(inverse) as RelationDescriptor<*>
-            inverseRelation!!.inverseRelation = this // both directions
-        }
-    }
-
-    override fun asRelation() :RelationDescriptor<T> {
-        return this
-    }
-
-    override fun defaultValue(): Any? {
-        TODO("Not yet implemented")
-    }
-
-    override fun validate(value: Any?) {
-        TODO("Not yet implemented")
-    }
-
-    fun isOwner() : Boolean {
-        return inverse !== null
-    }
-}
diff --git a/src/main/kotlin/org/sirius/dorm/model/RelationDescriptor.kt b/src/main/kotlin/org/sirius/dorm/model/RelationDescriptor.kt
@@ -0,0 +1,60 @@
+package org.sirius.dorm.model
+/*
+ * @COPYRIGHT (C) 2023 Andreas Ernst
+ *
+ * All rights reserved
+ */
+
+import org.sirius.dorm.ObjectManager
+import org.sirius.dorm.`object`.DataObject
+import org.sirius.dorm.`object`.MultiValuedRelation
+import org.sirius.dorm.`object`.Property
+import org.sirius.dorm.`object`.SingleValuedRelation
+import org.sirius.dorm.persistence.entity.PropertyEntity
+import org.sirius.dorm.transaction.Status
+
+open class RelationDescriptor<T:Any>(name: String, val target: String, val multiplicity: Multiplicity, val cascade: Cascade?, val inverse: String?) : PropertyDescriptor<T>(name) {
+    // instance data
+
+    var targetDescriptor: ObjectDescriptor? = null
+    var inverseRelation : RelationDescriptor<*>? = null
+
+    // override
+
+    override fun createProperty(obj: DataObject, status: Status, entity: PropertyEntity?) : Property {
+        val relation =  if ( multiplicity.mutliValued ) MultiValuedRelation(
+            this,
+            status,
+            obj,
+            entity,
+            targetDescriptor!!
+        )
+        else SingleValuedRelation(this, status, obj, entity, targetDescriptor!!)
+
+        return relation
+    }
+
+    override fun resolve(objectManager: ObjectManager, descriptor: ObjectDescriptor) {
+        targetDescriptor = objectManager.getDescriptor(target)
+        if ( inverse !== null) {
+            inverseRelation = targetDescriptor!!.property(inverse) as RelationDescriptor<*>
+            inverseRelation!!.inverseRelation = this // both directions
+        }
+    }
+
+    override fun asRelation() : RelationDescriptor<T> {
+        return this
+    }
+
+    override fun defaultValue(): Any? {
+        TODO("Not yet implemented")
+    }
+
+    override fun validate(value: Any?) {
+        TODO("Not yet implemented")
+    }
+
+    fun isOwner() : Boolean {
+        return inverse !== null
+    }
+}
diff --git a/src/main/kotlin/org/sirius/dorm/model/json/ObjectDescriptorDeserializer.kt b/src/main/kotlin/org/sirius/dorm/model/json/ObjectDescriptorDeserializer.kt
@@ -30,7 +30,10 @@ open class ObjectDescriptorDeserializer() : StdDeserializer<ObjectDescriptor>(Ob
             }
             else {
                 val multiplicity = Multiplicity.valueOf( property["target"].asText())
-                properties.add(RelationDescriptor(propertyName, property["target"].asText(), multiplicity, property["inverse"].asText()))
+                val cascade: Cascade? = null
+                if ( property.has("cascade"))
+                    Cascade.valueOf( property["cascade"].asText())
+                properties.add(RelationDescriptor(propertyName, property["target"].asText(), multiplicity, cascade, property["inverse"].asText()))
             }
         }
 

diff --git a/src/main/kotlin/org/sirius/dorm/model/json/ObjectDescriptorSerializer.kt b/src/main/kotlin/org/sirius/dorm/model/json/ObjectDescriptorSerializer.kt
@@ -27,6 +27,8 @@ open class ObjectDescriptorSerializer : StdSerializer<ObjectDescriptor>(ObjectDe
             else {
                 jsonGenerator.writeStringField("target", property.asRelation().target)
                 jsonGenerator.writeStringField("inverse", property.asRelation().inverse)
+                if (property.asRelation().cascade !== null)
+                    jsonGenerator.writeStringField("cascade", property.asRelation().cascade!!.name)
                 jsonGenerator.writeObjectField("multiplicity", property.asRelation().multiplicity.name)
 
                 property.asRelation()

diff --git a/src/main/kotlin/org/sirius/dorm/persistence/DataObjectMapper.kt b/src/main/kotlin/org/sirius/dorm/persistence/DataObjectMapper.kt
@@ -53,24 +53,16 @@ class DataObjectMapper() {
         if ( Tracer.ENABLED)
             Tracer.trace("com.sirius.dorm", TraceLevel.HIGH, "delete %s[%d]", obj.type.name, obj.id)
 
-        entityManager.remove(obj.entity!!)
+        entityManager.remove(obj.entity!!) // will delete properties
+
+        // what about aggregated objects
     }
 
     fun create(state: TransactionState, obj: DataObject) {
-        val descriptor = obj.type
-
-        //obj.entity = EntityEntity(0, descriptor.name, mapper.writeValueAsString(obj))
-
-        //entityManager.persist(obj.entity) // we need the id...is that required, think of a lifecycle hook?
-
         if ( Tracer.ENABLED)
             Tracer.trace("com.sirius.dorm", TraceLevel.HIGH, "create %s[%d]", obj.type.name, obj.entity!!.id)
 
-        writer4(descriptor).write(state, obj, entityManager) // will create the attribute entities
-
-        // set as value as well
-
-        obj.id = obj.entity!!.id
+        writer4(obj.type).write(state, obj, entityManager) // will create the attribute entities
     }