Skip to content

Commit

Permalink
Merge pull request #48 from SchwarzIT/feature/betterDocIdSupport
Browse files Browse the repository at this point in the history 
Feature/better doc id support
  • Loading branch information
@sbra0902
sbra0902 authored Sep 27, 2021
2 parents 79515d6 + 7b42199 commit 640c882
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 76 deletions.
4 changes: 2 additions & 2 deletions couchbase-entity-api/src/main/java/kaufland/com/coachbasebinderapi/PersistenceConfig.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ object PersistenceConfig {
fun deleteDocument(id: String, dbName: String)

@Throws(PersistenceException::class)
fun upsertDocument(document: MutableMap<String, Any>, id: String?, dbName: String)
fun upsertDocument(document: MutableMap<String, Any>, id: String?, dbName: String) : Map<String, Any>
}

interface SuspendingConnector{
Expand All @@ -33,7 +33,7 @@ object PersistenceConfig {
suspend fun deleteDocument(id: String, dbName: String)

@Throws(PersistenceException::class)
suspend fun upsertDocument(document: MutableMap<String, Any>, id: String?, dbName: String)
suspend fun upsertDocument(document: MutableMap<String, Any>, id: String?, dbName: String) : Map<String, Any>
}

val connector: Connector
Expand Down
5 changes: 3 additions & 2 deletions ...tity-connector/src/main/java/kaufland/com/couchbaseentityconnector/Couchbase2Connector.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,16 @@ abstract class Couchbase2Connector : PersistenceConfig.Connector {
}

@Throws(PersistenceException::class)
override fun upsertDocument(upsert: MutableMap<String, Any>, docId: String?, name: String) {
override fun upsertDocument(upsert: MutableMap<String, Any>, docId: String?, name: String) : Map<String, Any> {
if (upsert["_id"] == null && docId != null) {
upsert["_id"] = docId
}
val unsavedDoc = MutableDocument(docId, upsert)
try {
return try {
upsert["_id"] = unsavedDoc.id
unsavedDoc.setString("_id", unsavedDoc.id)
getDatabase(name).save(unsavedDoc)
upsert
} catch (e: CouchbaseLiteException) {
throw PersistenceException(e)
}
Expand Down
216 changes: 155 additions & 61 deletions couchbase-entity/src/main/java/com/kaufland/generation/model/EntityGeneration.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.kaufland.generation.model

import com.kaufland.generation.MapifyableImplGeneration
import com.kaufland.model.entity.EntityHolder
import com.kaufland.model.id.DocIdHolder
import com.kaufland.util.TypeUtil
import com.kaufland.util.TypeUtil.string
import com.squareup.kotlinpoet.*
Expand All @@ -16,10 +17,14 @@ class EntityGeneration {
get() = FunSpec.builder("getId")
.addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE)
.returns(TypeUtil.string().copy(nullable = true))
.addStatement("return mDoc.get(%N) as %T", "_ID", TypeUtil.string().copy(nullable = true))
.addStatement(
"return mDoc.get(%N) as %T",
"_ID",
TypeUtil.string().copy(nullable = true)
)
.build()

fun generateModel(holder: EntityHolder, useSuspend : Boolean): FileSpec {
fun generateModel(holder: EntityHolder, useSuspend: Boolean): FileSpec {
val companionSpec = TypeSpec.companionObjectBuilder()
companionSpec.addProperty(idConstant())
companionSpec.addFunctions(create(holder, useSuspend))
Expand All @@ -44,31 +49,42 @@ class EntityGeneration {
val builderBuilder = BuilderClassGeneration.generateBaseBuilder(holder)

val typeBuilder = TypeSpec.classBuilder(holder.entitySimpleName)
.addModifiers(KModifier.PUBLIC)
.addSuperinterface(TypeUtil.iEntity())
.addSuperinterface(holder.interfaceTypeName)
.addProperty(holder.dbNameProperty())
.addFunction(EnsureTypesGeneration.ensureTypes(holder, false))
.addFunction(CblDefaultGeneration.addDefaults(holder, false))
.addFunction(CblConstantGeneration.addConstants(holder, false))
.addProperty(PropertySpec.builder("mDoc", TypeUtil.mutableMapStringAny(), KModifier.PRIVATE).mutable().initializer("%T()", TypeUtil.hashMapStringAny()).build())
.addProperty(PropertySpec.builder("mDocChanges", TypeUtil.mutableMapStringAnyNullable(), KModifier.PRIVATE).mutable().initializer("%T()", TypeUtil.hashMapStringAnyNullable()).build())
.addFunction(constructor(holder))
.addFunction(setAll(holder))
.addFunctions(TypeConversionMethodsGeneration(useSuspend).generate())
.addFunction(id).superclass(holder.sourceElement!!.asType().asTypeName())
.addFunction(toMap(holder, useSuspend))
.addFunction(BuilderClassGeneration.generateBuilderFun())
.addModifiers(KModifier.PUBLIC)
.addSuperinterface(TypeUtil.iEntity())
.addSuperinterface(holder.interfaceTypeName)
.addProperty(holder.dbNameProperty())
.addFunction(EnsureTypesGeneration.ensureTypes(holder, false))
.addFunction(CblDefaultGeneration.addDefaults(holder, false))
.addFunction(CblConstantGeneration.addConstants(holder, false))
.addProperty(
PropertySpec.builder(
"mDoc",
TypeUtil.mutableMapStringAny(),
KModifier.PRIVATE
).mutable().initializer("%T()", TypeUtil.hashMapStringAny()).build()
)
.addProperty(
PropertySpec.builder(
"mDocChanges",
TypeUtil.mutableMapStringAnyNullable(),
KModifier.PRIVATE
).mutable().initializer("%T()", TypeUtil.hashMapStringAnyNullable()).build()
)
.addFunction(constructor(holder))
.addFunction(setAll(holder))
.addFunctions(TypeConversionMethodsGeneration(useSuspend).generate())
.addFunction(id).superclass(holder.sourceElement!!.asType().asTypeName())
.addFunction(toMap(holder, useSuspend))
.addFunction(BuilderClassGeneration.generateBuilderFun())

holder.deprecated?.addDeprecated(typeBuilder)

if(holder.entityType != Entity.Type.READONLY) {
holder.docId?.let {
companionSpec.addFunction(it.companionFunction(holder))
typeBuilder.addFunction(it.buildExpectedDocId(holder))
typeBuilder.addSuperinterface(TypeUtil.iDocId())
}
holder.docId?.let {
companionSpec.addFunction(it.companionFunction(holder))
typeBuilder.addFunction(it.buildExpectedDocId(holder))
typeBuilder.addSuperinterface(TypeUtil.iDocId())
}

if (holder.comment.isNotEmpty()) {
typeBuilder.addKdoc(KDocGeneration.generate(holder.comment))
}
Expand All @@ -77,23 +93,36 @@ class EntityGeneration {
typeBuilder.addSuperinterface(baseModelHolder.interfaceTypeName)
}

if(holder.modifierOpen){
if (holder.modifierOpen) {
typeBuilder.addModifiers(KModifier.OPEN)
}

for (fieldHolder in holder.allFields) {
fieldHolder.builderSetter(holder.dbName, holder.`package`, holder.entitySimpleName, true, holder.deprecated)?.let {
fieldHolder.builderSetter(
holder.dbName,
holder.`package`,
holder.entitySimpleName,
true,
holder.deprecated
)?.let {
builderBuilder.addFunction(it)
}

companionSpec.addProperties(fieldHolder.createFieldConstant())
typeBuilder.addProperty(fieldHolder.property(holder.dbName, holder.abstractParts, true, holder.deprecated))
typeBuilder.addProperty(
fieldHolder.property(
holder.dbName,
holder.abstractParts,
true,
holder.deprecated
)
)
}

typeBuilder.addType(companionSpec.build())
typeBuilder.addFunction(RebindMethodGeneration().generate(true))

if(holder.entityType != Entity.Type.READONLY){
if (holder.entityType != Entity.Type.READONLY) {
typeBuilder.addFunction(delete(holder, useSuspend))
typeBuilder.addFunction(save(holder, useSuspend))
}
Expand All @@ -106,106 +135,171 @@ class EntityGeneration {
}

private fun findById(holder: EntityHolder, useSuspend: Boolean): FunSpec {
return FunSpec.builder("findById").addModifiers(evaluateModifiers(useSuspend)).addParameter("id", String::class).addAnnotation(JvmStatic::class)
.addStatement("val result = %T.${getDocumentMethod(useSuspend)}(id, %S)", PersistenceConfig::class, holder.dbName)
.addStatement("return if(result != null) %N(result) else null", holder.entitySimpleName)
.returns(holder.entityTypeName.copy(true)).build()
return FunSpec.builder("findById").addModifiers(evaluateModifiers(useSuspend))
.addParameter("id", String::class).addAnnotation(JvmStatic::class)
.addStatement(
"val result = %T.${getDocumentMethod(useSuspend)}(id, %S)",
PersistenceConfig::class,
holder.dbName
)
.addStatement("return if(result != null) %N(result) else null", holder.entitySimpleName)
.returns(holder.entityTypeName.copy(true)).build()
}

private fun findByIds(holder: EntityHolder, useSuspend: Boolean): FunSpec {
return FunSpec.builder("findByIds").addModifiers(evaluateModifiers(useSuspend)).addParameter("ids", TypeUtil.list(string())).addAnnotation(JvmStatic::class)
.addStatement("val result = %T.${getDocumentsMethod(useSuspend)}(ids, %S)", PersistenceConfig::class, holder.dbName)
.addStatement("return result.filterNotNull().mapNotNull { %N(it) }", holder.entitySimpleName)
return FunSpec.builder("findByIds").addModifiers(evaluateModifiers(useSuspend))
.addParameter("ids", TypeUtil.list(string())).addAnnotation(JvmStatic::class)
.addStatement(
"val result = %T.${getDocumentsMethod(useSuspend)}(ids, %S)",
PersistenceConfig::class,
holder.dbName
)
.addStatement(
"return result.filterNotNull().mapNotNull { %N(it) }",
holder.entitySimpleName
)
.returns(TypeUtil.list(holder.entityTypeName.copy(true))).build()
}

private fun idConstant(): PropertySpec {
return PropertySpec.builder("_ID", String::class, KModifier.PUBLIC, KModifier.FINAL).initializer("%S", "_id").addAnnotation(JvmField::class).build()
return PropertySpec.builder("_ID", String::class, KModifier.PUBLIC, KModifier.FINAL)
.initializer("%S", "_id").addAnnotation(JvmField::class).build()
}

private fun setAll(holder: EntityHolder): FunSpec {
val setAllBuilder = FunSpec.builder("setAll").addModifiers(KModifier.PUBLIC).addParameter("map", TypeUtil.mapStringAnyNullable()).addStatement("mDocChanges.putAll(map)", TypeUtil.mapStringAnyNullable(), PersistenceConfig::class, holder.dbName)
val setAllBuilder = FunSpec.builder("setAll").addModifiers(KModifier.PUBLIC)
.addParameter("map", TypeUtil.mapStringAnyNullable()).addStatement(
"mDocChanges.putAll(map)",
TypeUtil.mapStringAnyNullable(),
PersistenceConfig::class,
holder.dbName
)

return setAllBuilder.build()
}

private fun toMap(holder: EntityHolder, useSuspend: Boolean): FunSpec {
var refreshDoc = "getId()?.let{%T.${getDocumentMethod(useSuspend)}(it, %S)} ?: mDoc"

if(useSuspend){
if (useSuspend) {
refreshDoc = "kotlinx.coroutines.runBlocking{$refreshDoc}"
}

val toMapBuilder = FunSpec.builder("toMap").addModifiers(KModifier.OVERRIDE).returns(TypeUtil.mutableMapStringAny()).addStatement("val doc = $refreshDoc", PersistenceConfig::class, holder.dbName)
val toMapBuilder = FunSpec.builder("toMap").addModifiers(KModifier.OVERRIDE)
.returns(TypeUtil.mutableMapStringAny())
.addStatement("val doc = $refreshDoc", PersistenceConfig::class, holder.dbName)

for (constantField in holder.fieldConstants.values) {
toMapBuilder.addStatement("mDocChanges.put(%S, %N)", constantField.dbField, constantField.constantValueAccessorName)
toMapBuilder.addStatement(
"mDocChanges.put(%S, %N)",
constantField.dbField,
constantField.constantValueAccessorName
)
}

toMapBuilder.addStatement("var temp = mutableMapOf<%T, %T>()", TypeUtil.string(), TypeUtil.any())
toMapBuilder.addCode(CodeBlock.builder()
toMapBuilder.addStatement(
"var temp = mutableMapOf<%T, %T>()",
TypeUtil.string(),
TypeUtil.any()
)
toMapBuilder.addCode(
CodeBlock.builder()
.beginControlFlow("if(doc != null)")
.addStatement("temp.putAll(doc)")
.endControlFlow()
.beginControlFlow("if(mDocChanges != null)")
.beginControlFlow("mDocChanges.forEach")
.beginControlFlow("if(it.value == null)").addStatement("temp.remove(it.key)").endControlFlow()
.beginControlFlow("if(it.value == null)").addStatement("temp.remove(it.key)")
.endControlFlow()
.beginControlFlow("else").addStatement("temp[it.key] = it.value!!").endControlFlow()
.endControlFlow()
.endControlFlow()
.addStatement("return temp").build())
.addStatement("return temp").build()
)

return toMapBuilder.build()
}

private fun delete(holder: EntityHolder, useSuspend: Boolean): FunSpec {
return FunSpec.builder("delete").addModifiers(evaluateModifiers(useSuspend)).throws(PersistenceException::class).addStatement("getId()?.let{%T.${deleteDocumentMethod(useSuspend)}(it, %S)}", PersistenceConfig::class, holder.dbName).build()
return FunSpec.builder("delete").addModifiers(evaluateModifiers(useSuspend))
.throws(PersistenceException::class).addStatement(
"getId()?.let{%T.${deleteDocumentMethod(useSuspend)}(it, %S)}",
PersistenceConfig::class,
holder.dbName
).build()
}

private fun save(holder: EntityHolder, useSuspend: Boolean): FunSpec {
val saveBuilder = FunSpec.builder("save").addModifiers(evaluateModifiers(useSuspend)).throws(PersistenceException::class).addStatement("val doc = toMap()")
val saveBuilder = FunSpec.builder("save").addModifiers(evaluateModifiers(useSuspend))
.throws(PersistenceException::class).addStatement("val doc = toMap()")

saveBuilder.addStatement("%T.${upsertDocumentMethod(useSuspend)}(doc, getId(), %S)", PersistenceConfig::class, holder.dbName)
saveBuilder.addStatement("rebind(doc)")
var idResolve = "getId()"

holder.docId?.let {
idResolve += "?: ${DocIdHolder.BUILD_FUNCTION_NAME}()"
}

saveBuilder.addStatement("val docId = $idResolve")
saveBuilder.addStatement(
"val upsertedDoc = %T.${upsertDocumentMethod(useSuspend)}(doc, docId, %S)",
PersistenceConfig::class,
holder.dbName
)
saveBuilder.addStatement("rebind(upsertedDoc)")

return saveBuilder.build()
}

private fun constructor(holder: EntityHolder): FunSpec {
return FunSpec.constructorBuilder().addModifiers(KModifier.PUBLIC).addParameter("doc", TypeUtil.mapStringAny()).addStatement("rebind(ensureTypes(doc))").build()
return FunSpec.constructorBuilder().addModifiers(KModifier.PUBLIC)
.addParameter("doc", TypeUtil.mapStringAny()).addStatement("rebind(ensureTypes(doc))")
.build()
}

private fun evaluateModifiers(useSuspend: Boolean): List<KModifier> {
return if(useSuspend) listOf(KModifier.PUBLIC, KModifier.SUSPEND) else listOf(KModifier.PUBLIC)
return if (useSuspend) listOf(
KModifier.PUBLIC,
KModifier.SUSPEND
) else listOf(KModifier.PUBLIC)
}

private fun create(holder: EntityHolder, useSuspend: Boolean): List<FunSpec> {

return listOf(
FunSpec.builder("create").addModifiers(evaluateModifiers(useSuspend)).addParameter("id", String::class).addAnnotation(JvmStatic::class).addStatement("return %N(%T.${getDocumentMethod(useSuspend)}(id, %S) ?: mutableMapOf(_ID to id))",
holder.entitySimpleName, PersistenceConfig::class, holder.dbName).returns(holder.entityTypeName).build(),
FunSpec.builder("create").addModifiers(evaluateModifiers(useSuspend)).addAnnotation(JvmStatic::class).addStatement("return %N(%T())",
holder.entitySimpleName, TypeUtil.hashMapStringAny()).returns(holder.entityTypeName).build(),
FunSpec.builder("create").addModifiers(KModifier.PUBLIC).addParameter("map", TypeUtil.mutableMapStringAny()).addAnnotation(JvmStatic::class).addStatement("return %N(map)",
holder.entitySimpleName).returns(holder.entityTypeName).build()
FunSpec.builder("create").addModifiers(evaluateModifiers(useSuspend))
.addParameter("id", String::class).addAnnotation(JvmStatic::class).addStatement(
"return %N(%T.${getDocumentMethod(useSuspend)}(id, %S) ?: mutableMapOf(_ID to id))",
holder.entitySimpleName, PersistenceConfig::class, holder.dbName
).returns(holder.entityTypeName).build(),
FunSpec.builder("create").addModifiers(evaluateModifiers(useSuspend))
.addAnnotation(JvmStatic::class).addStatement(
"return %N(%T())",
holder.entitySimpleName, TypeUtil.hashMapStringAny()
).returns(holder.entityTypeName).build(),
FunSpec.builder("create").addModifiers(KModifier.PUBLIC)
.addParameter("map", TypeUtil.mutableMapStringAny()).addAnnotation(JvmStatic::class)
.addStatement(
"return %N(map)",
holder.entitySimpleName
).returns(holder.entityTypeName).build()
)
}

companion object {

private fun getDocumentMethod(useSuspend: Boolean) : String{
return "${if(useSuspend) "suspendingConnector" else "connector"}.getDocument"
private fun getDocumentMethod(useSuspend: Boolean): String {
return "${if (useSuspend) "suspendingConnector" else "connector"}.getDocument"
}

private fun getDocumentsMethod(useSuspend: Boolean) : String{
return "${if(useSuspend) "suspendingConnector" else "connector"}.getDocuments"
private fun getDocumentsMethod(useSuspend: Boolean): String {
return "${if (useSuspend) "suspendingConnector" else "connector"}.getDocuments"
}

private fun deleteDocumentMethod(useSuspend: Boolean) : String{
private fun deleteDocumentMethod(useSuspend: Boolean): String {
return "${if (useSuspend) "suspendingConnector" else "connector"}.deleteDocument"
}

private fun upsertDocumentMethod(useSuspend: Boolean) : String{
private fun upsertDocumentMethod(useSuspend: Boolean): String {
return "${if (useSuspend) "suspendingConnector" else "connector"}.upsertDocument"
}
}
Expand Down
Loading

0 comments on commit 640c882

Please sign in to comment.