# implemented possibility to generate open wrappers

# generate interface for basedOn Models
SchwarzIT · Nov 25, 2020 · 497e740 · 497e740
1 parent b4ac55d
commit 497e740
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 6 deletions.
diff --git a/couchbase-entity-api/src/main/java/kaufland/com/coachbasebinderapi/MapWrapper.java b/couchbase-entity-api/src/main/java/kaufland/com/coachbasebinderapi/MapWrapper.java
@@ -11,4 +11,6 @@
 public @interface MapWrapper {
 
     Class<?> value() default Void.class;
+
+    boolean modifierOpen() default false;
 }
diff --git a/couchbase-entity/src/main/java/com/kaufland/CoachBaseBinderProcessor.kt b/couchbase-entity/src/main/java/com/kaufland/CoachBaseBinderProcessor.kt
@@ -76,7 +76,7 @@ class CoachBaseBinderProcessor : AbstractProcessor() {
         var mapWrapperStrings = mapWrappers.map { element -> element.toString() }
         var generatedInterfaces = mutableSetOf<String>()
 
-        var baseModels = validateAndCreateBaseModelMap(roundEnv.getElementsAnnotatedWith(BaseModel::class.java), mapWrapperStrings)
+        var baseModels = validateAndCreateBaseModelMap(roundEnv.getElementsAnnotatedWith(BaseModel::class.java), mapWrapperStrings, generatedInterfaces)
 
         validateAndProcess(roundEnv.getElementsAnnotatedWith(Entity::class.java), object : EntityProcessor {
             override fun process(element: Element): FileSpec? {
@@ -114,13 +114,14 @@ class CoachBaseBinderProcessor : AbstractProcessor() {
         return true // no further processing of this annotation type
     }
 
-    private fun validateAndCreateBaseModelMap(elements: Collection<Element>, wrapperString: List<String>) : Map<String, BaseModelHolder>{
+    private fun validateAndCreateBaseModelMap(elements: Collection<Element>, wrapperString: List<String>, generatedInterfaces: MutableSet<String>) : Map<String, BaseModelHolder>{
         val result = HashMap<String, BaseModelHolder>()
         for (elem in elements) {
             validator.preValidate(elem, mLogger)
             if (!mLogger.hasErrors()) {
                 val baseModel = EntityFactory.createBaseModelHolder(elem, wrapperString)
                 if(postValidate(baseModel)){
+                    generateInterface(generatedInterfaces, baseModel)
                     result["${baseModel.`package`}.${baseModel.sourceClazzSimpleName}"] = baseModel
                 }
             }

diff --git a/couchbase-entity/src/main/java/com/kaufland/generation/EntityGeneration.kt b/couchbase-entity/src/main/java/com/kaufland/generation/EntityGeneration.kt
@@ -52,6 +52,10 @@ class EntityGeneration {
                 .addFunction(toMap(holder, useSuspend))
                 .addFunction(BuilderClassGeneration.generateBuilderFun())
 
+        for (baseModelHolder in holder.basedOn) {
+            typeBuilder.addSuperinterface(baseModelHolder.interfaceTypeName)
+        }
+
         if(holder.modifierOpen){
             typeBuilder.addModifiers(KModifier.OPEN)
         }

diff --git a/couchbase-entity/src/main/java/com/kaufland/generation/WrapperGeneration.kt b/couchbase-entity/src/main/java/com/kaufland/generation/WrapperGeneration.kt
@@ -28,6 +28,14 @@ class WrapperGeneration {
                 .superclass(holder.sourceElement!!.asType().asTypeName())
                 .addFunction(BuilderClassGeneration.generateBuilderFun())
 
+        for (baseModelHolder in holder.basedOn) {
+            typeBuilder.addSuperinterface(baseModelHolder.interfaceTypeName)
+        }
+
+        if(holder.modifierOpen){
+            typeBuilder.addModifiers(KModifier.OPEN)
+        }
+
         for (fieldHolder in holder.allFields) {
 
             companionSpec.addProperties(fieldHolder.createFieldConstant())

diff --git a/couchbase-entity/src/main/java/com/kaufland/model/EntityFactory.kt b/couchbase-entity/src/main/java/com/kaufland/model/EntityFactory.kt
@@ -30,8 +30,8 @@ object EntityFactory {
     }
 
     fun createChildEntityHolder(cblEntityElement: Element, allWrappers: List<String>, allBaseModels: Map<String, BaseModelHolder>): WrapperEntityHolder {
-
-        return create(cblEntityElement, WrapperEntityHolder(), allWrappers, allBaseModels) as WrapperEntityHolder
+        val annotation = cblEntityElement.getAnnotation(MapWrapper::class.java)
+        return create(cblEntityElement, WrapperEntityHolder(annotation.modifierOpen), allWrappers, allBaseModels) as WrapperEntityHolder
     }
 
     private fun create(cblEntityElement: Element, content: BaseEntityHolder, allWrappers: List<String>, allBaseModels: Map<String, BaseModelHolder>): BaseEntityHolder {
@@ -44,6 +44,7 @@ object EntityFactory {
 
         basedOnValue?.forEach { type ->
             allBaseModels[type.toString()]?.let {
+                content.basedOn.add(it)
                 content.fieldConstants.putAll(it.fieldConstants)
                 content.fields.putAll(it.fields)
                 content.generateAccessors.addAll(it.generateAccessors)

diff --git a/couchbase-entity/src/main/java/com/kaufland/model/entity/BaseEntityHolder.kt b/couchbase-entity/src/main/java/com/kaufland/model/entity/BaseEntityHolder.kt
@@ -30,6 +30,8 @@ abstract class BaseEntityHolder {
 
     val generateAccessors : MutableList<CblGenerateAccessorHolder> = ArrayList()
 
+    val basedOn : MutableList<BaseModelHolder> = ArrayList()
+
     val allFields: List<CblBaseFieldHolder>
         get() {
             val allField = ArrayList<CblBaseFieldHolder>()

diff --git a/couchbase-entity/src/main/java/com/kaufland/model/entity/BaseModelHolder.kt b/couchbase-entity/src/main/java/com/kaufland/model/entity/BaseModelHolder.kt
@@ -1,3 +1,5 @@
 package com.kaufland.model.entity
 
 class BaseModelHolder() : BaseEntityHolder()
+
+
diff --git a/couchbase-entity/src/main/java/com/kaufland/model/entity/WrapperEntityHolder.kt b/couchbase-entity/src/main/java/com/kaufland/model/entity/WrapperEntityHolder.kt
@@ -1,6 +1,6 @@
 package com.kaufland.model.entity
 
-class WrapperEntityHolder : BaseEntityHolder() {
+class WrapperEntityHolder(val modifierOpen: Boolean) : BaseEntityHolder() {
 
     override val entitySimpleName: String
         get() = sourceClazzSimpleName + "Wrapper"

diff --git a/demo/src/main/java/kaufland/com/demo/tesst/article/BaseArticle.kt b/demo/src/main/java/kaufland/com/demo/tesst/article/BaseArticle.kt
@@ -6,7 +6,7 @@ import kaufland.com.coachbasebinderapi.MapWrapper
 import schwarz.fwws.shared.model.DWG
 import schwarz.fwws.shared.model.Model
 
-@MapWrapper
+@MapWrapper(modifierOpen = true)
 @Fields(
         Field(name = "country", type = String::class),
         Field(name = "type", type = String::class, defaultValue = BaseArticle.TYPE, readonly = true),
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,5 @@
		package com.kaufland.model.entity

		class BaseModelHolder() : BaseEntityHolder()