codinux
/
BankingClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also BankingPersistenceJson uses now Banking's ISerializer

This commit is contained in:
dankito 2020-07-10 13:59:19 +02:00
parent 8992d902e8
commit f4312c52db
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence/LuceneBankingPersistence/src/main/kotlin/net/dankito/banking/persistence/LuceneBankingPersistence.kt
View File

@ -16,10 +16,10 @@ import net.dankito.banking.LuceneConfig.Companion.UsageFieldName
import net.dankito.banking.ui.model.Customer import net.dankito.banking.ui.model.Customer
import net.dankito.banking.ui.model.AccountTransaction import net.dankito.banking.ui.model.AccountTransaction
import net.dankito.banking.ui.model.BankAccount import net.dankito.banking.ui.model.BankAccount
import net.dankito.banking.util.ISerializer
import net.dankito.banking.util.JacksonJsonSerializer
import net.dankito.utils.lucene.index.DocumentsWriter import net.dankito.utils.lucene.index.DocumentsWriter
import net.dankito.utils.lucene.index.FieldBuilder import net.dankito.utils.lucene.index.FieldBuilder
import net.dankito.utils.serialization.ISerializer
import net.dankito.utils.serialization.JacksonJsonSerializer
import org.apache.lucene.index.IndexableField import org.apache.lucene.index.IndexableField
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.io.File import java.io.File

4
persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/BankingPersistenceJson.kt
View File

@ -3,8 +3,8 @@ package net.dankito.banking.persistence
import net.dankito.banking.ui.model.Customer import net.dankito.banking.ui.model.Customer
import net.dankito.banking.ui.model.AccountTransaction import net.dankito.banking.ui.model.AccountTransaction
import net.dankito.banking.ui.model.BankAccount import net.dankito.banking.ui.model.BankAccount
import net.dankito.utils.serialization.ISerializer import net.dankito.banking.util.ISerializer
import net.dankito.utils.serialization.JacksonJsonSerializer import net.dankito.banking.util.JacksonJsonSerializer
import java.io.File import java.io.File

2
ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/di/BankingModule.kt
View File

@ -27,8 +27,6 @@ import net.dankito.text.extraction.pdf.PdfBoxAndroidPdfTextExtractor
import net.dankito.text.extraction.pdf.iText2PdfTextExtractor import net.dankito.text.extraction.pdf.iText2PdfTextExtractor
import net.dankito.utils.IThreadPool import net.dankito.utils.IThreadPool
import net.dankito.utils.ThreadPool import net.dankito.utils.ThreadPool
import net.dankito.utils.serialization.ISerializer
import net.dankito.utils.serialization.JacksonJsonSerializer
import net.dankito.utils.web.client.IWebClient import net.dankito.utils.web.client.IWebClient
import net.dankito.utils.web.client.OkHttpWebClient import net.dankito.utils.web.client.OkHttpWebClient
import java.io.File import java.io.File

3
ui/BankingUiCommon/src/main/java/net/dankito/banking/util/ISerializer.kt
View File

@ -9,4 +9,7 @@ interface ISerializer {
fun <T> deserializeObject(serializedObjectFile: File, objectClass: Class<T>, vararg genericParameterTypes: Class<*>): T? fun <T> deserializeObject(serializedObjectFile: File, objectClass: Class<T>, vararg genericParameterTypes: Class<*>): T?
fun <T> deserializeListOr(serializedObjectFile: File, genericListParameterType: Class<T>,
defaultValue: List<T> = listOf()) : List<T>
} }

4
ui/BankingUiCommon/src/main/java/net/dankito/banking/util/JacksonJsonSerializer.kt
View File

@ -17,4 +17,8 @@ open class JacksonJsonSerializer(
return serializer.deserializeObject(serializedObjectFile, objectClass, *genericParameterTypes) return serializer.deserializeObject(serializedObjectFile, objectClass, *genericParameterTypes)
} }
override fun <T> deserializeListOr(serializedObjectFile: File, genericListParameterType: Class<T>, defaultValue: List<T>): List<T> {
return serializer.deserializeListOr(serializedObjectFile, genericListParameterType, defaultValue)
}
} }

4
ui/BankingUiCommon/src/main/java/net/dankito/banking/util/NoOpSerializer.kt
View File

@ -13,4 +13,8 @@ open class NoOpSerializer : ISerializer {
return null return null
} }
override fun <T> deserializeListOr(serializedObjectFile: File, genericListParameterType: Class<T>, defaultValue: List<T>): List<T> {
return defaultValue
}
} }