Merge pull request #72 from SchwarzIT/feature/add-reduced-and-based-o…

…n-interfaces-on-generated # added reduced models and basedOn models resulting interfaces to gen…
SchwarzIT · Apr 19, 2023 · 161a200 · 161a200
2 parents 5af1f27 + 3a9a62c
commit 161a200
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/...processor/src/main/java/com/schwarz/crystalprocessor/generation/model/EntityGeneration.kt b/...processor/src/main/java/com/schwarz/crystalprocessor/generation/model/EntityGeneration.kt
@@ -59,6 +59,7 @@ class EntityGeneration {
             .addModifiers(KModifier.PUBLIC)
             .addSuperinterface(TypeUtil.iEntity())
             .addSuperinterface(holder.interfaceTypeName)
+            .addSuperinterfaces(holder.collectAllChildInterfaces())
             .addProperty(holder.dbNameProperty())
             .addFunction(EnsureTypesGeneration.ensureTypes(holder, false))
             .addFunction(CblDefaultGeneration.addDefaults(holder, false))

diff --git a/...rocessor/src/main/java/com/schwarz/crystalprocessor/generation/model/WrapperGeneration.kt b/...rocessor/src/main/java/com/schwarz/crystalprocessor/generation/model/WrapperGeneration.kt
@@ -19,6 +19,7 @@ class WrapperGeneration {
             .addSuperinterface(TypeUtil.mapSupport())
             .addModifiers(KModifier.PUBLIC)
             .addSuperinterface(holder.interfaceTypeName)
+            .addSuperinterfaces(holder.collectAllChildInterfaces())
             .addFunction(EnsureTypesGeneration.ensureTypes(holder, true))
             .addFunction(CblDefaultGeneration.addDefaults(holder, true))
             .addFunction(CblConstantGeneration.addConstants(holder, true))

diff --git a/...map-processor/src/main/java/com/schwarz/crystalprocessor/model/entity/BaseEntityHolder.kt b/...map-processor/src/main/java/com/schwarz/crystalprocessor/model/entity/BaseEntityHolder.kt
@@ -55,4 +55,10 @@ abstract class BaseEntityHolder(val sourceElement: ISourceModel) : IClassModel b
 
     val interfaceTypeName: TypeName
         get() = ClassName(sourcePackage, interfaceSimpleName)
+
+    fun collectAllChildInterfaces(): List<TypeName> {
+        val basedOnInterfaceTypeNames = basedOn.map { it.interfaceTypeName }
+        val reducesModelsInterfaceTypeNames = reducesModels.map { ClassName(sourcePackage, "I${it.namePrefix}$sourceClazzSimpleName") }
+        return listOf(*basedOnInterfaceTypeNames.toTypedArray(), *reducesModelsInterfaceTypeNames.toTypedArray())
+    }
 }