From fddb1e818e191f4870bac68b7f7893f18fccb4fb Mon Sep 17 00:00:00 2001 From: Antoine A <> Date: Mon, 8 Apr 2024 09:54:02 +0200 Subject: Cleanup --- bank/src/main/kotlin/tech/libeufin/bank/Main.kt | 3 +-- bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt | 4 ++-- bank/src/main/kotlin/tech/libeufin/bank/api/CoreBankApi.kt | 3 +-- common/src/main/kotlin/crypto/CryptoUtil.kt | 4 ++-- common/src/main/kotlin/helpers.kt | 10 ---------- nexus/build.gradle | 2 +- nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt | 1 - nexus/src/main/kotlin/tech/libeufin/nexus/XmlCombinators.kt | 10 +++++----- nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt | 1 - testbench/src/test/kotlin/Iso20022Test.kt | 2 +- 10 files changed, 13 insertions(+), 27 deletions(-) diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt index db2e6d8d..48c1e082 100644 --- a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt +++ b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt @@ -484,8 +484,7 @@ class CreateAccount : CliktCommand( ) } req?.let { - val result = createAccount(db, ctx, req, true) - when (result) { + when (val result = createAccount(db, ctx, req, true)) { AccountCreationResult.BonusBalanceInsufficient -> throw Exception("Insufficient admin funds to grant bonus") AccountCreationResult.LoginReuse -> diff --git a/bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt b/bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt index ff17173a..67f77bd9 100644 --- a/bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt +++ b/bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt @@ -158,10 +158,10 @@ data class ChallengeContactData( val phone: Option = Option.None ) { init { - if (email.get()?.let { !EMAIL_PATTERN.matches(it) } ?: false) + if (email.get()?.let { !EMAIL_PATTERN.matches(it) } == true) throw badRequest("email contact data '$email' is malformed") - if (phone.get()?.let { !PHONE_PATTERN.matches(it) } ?: false) + if (phone.get()?.let { !PHONE_PATTERN.matches(it) } == true) throw badRequest("phone contact data '$phone' is malformed") } companion object { diff --git a/bank/src/main/kotlin/tech/libeufin/bank/api/CoreBankApi.kt b/bank/src/main/kotlin/tech/libeufin/bank/api/CoreBankApi.kt index fc19b26c..39193912 100644 --- a/bank/src/main/kotlin/tech/libeufin/bank/api/CoreBankApi.kt +++ b/bank/src/main/kotlin/tech/libeufin/bank/api/CoreBankApi.kt @@ -296,8 +296,7 @@ private fun Routing.coreBankAccountsApi(db: Database, ctx: BankConfig) { authAdmin(db, TokenScope.readwrite, !ctx.allowRegistration) { post("/accounts") { val req = call.receive() - val result = createAccount(db, ctx, req, isAdmin) - when (result) { + when (val result = createAccount(db, ctx, req, isAdmin)) { AccountCreationResult.BonusBalanceInsufficient -> throw conflict( "Insufficient admin funds to grant bonus", TalerErrorCode.BANK_UNALLOWED_DEBIT diff --git a/common/src/main/kotlin/crypto/CryptoUtil.kt b/common/src/main/kotlin/crypto/CryptoUtil.kt index a508c5b2..f6079ffe 100644 --- a/common/src/main/kotlin/crypto/CryptoUtil.kt +++ b/common/src/main/kotlin/crypto/CryptoUtil.kt @@ -76,8 +76,8 @@ object CryptoUtil { /** Extract an RSA public key from a [raw] X.509 certificate */ fun RSAPublicFromCertificate(raw: ByteArray): RSAPublicKey { - val certificate = CertificateFactory.getInstance("X.509").generateCertificate(raw.inputStream()); - return certificate.getPublicKey() as RSAPublicKey + val certificate = CertificateFactory.getInstance("X.509").generateCertificate(raw.inputStream()) + return certificate.publicKey as RSAPublicKey } /** Generate an RSA public key from a [private] one */ diff --git a/common/src/main/kotlin/helpers.kt b/common/src/main/kotlin/helpers.kt index 895f82ad..fc361ab9 100644 --- a/common/src/main/kotlin/helpers.kt +++ b/common/src/main/kotlin/helpers.kt @@ -29,16 +29,6 @@ import java.io.InputStream import java.io.ByteArrayOutputStream import kotlin.random.Random -fun getQueryParam(uriQueryString: String, param: String): String? { - // TODO replace with ktor API ? - uriQueryString.split('&').forEach { - val kv = it.split('=') - if (kv[0] == param) - return kv[1] - } - return null -} - /* ----- String ----- */ fun String.decodeBase64(): ByteArray = Base64.getDecoder().decode(this) diff --git a/nexus/build.gradle b/nexus/build.gradle index 4ef88188..837e46f0 100644 --- a/nexus/build.gradle +++ b/nexus/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation("com.github.ajalt.clikt:clikt:$clikt_version") implementation("org.postgresql:postgresql:$postgres_version") // Ktor client library - implementation("io.ktor:ktor-client-apache:$ktor_version") + implementation("io.ktor:ktor-client-cio:$ktor_version") // PDF generation implementation("com.itextpdf:itext-core:8.0.3") diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt index 9e95a52c..328fe240 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt @@ -360,7 +360,6 @@ class EbicsFetch: CliktCommand("Fetches EBICS files") { * In this current version, it does not implement long polling, instead * it runs transient if FREQUENCY is zero. Transient is also the default * mode when no flags are passed to the invocation. - * FIXME: reduce code duplication with the submit subcommand. */ override fun run() = cliCmd(logger, common.log) { val cfg = extractEbicsConfig(common.config) diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/XmlCombinators.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/XmlCombinators.kt index 1ad16f6c..eb64a1f6 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/XmlCombinators.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/XmlCombinators.kt @@ -58,12 +58,12 @@ interface XmlBuilder { } fun toDom(root: String, schema: String?, f: XmlBuilder.() -> Unit): Document { - val factory = DocumentBuilderFactory.newInstance(); + val factory = DocumentBuilderFactory.newInstance() factory.isNamespaceAware = true - val builder = factory.newDocumentBuilder(); - val doc = builder.newDocument(); - doc.setXmlVersion("1.0") - doc.setXmlStandalone(true) + val builder = factory.newDocumentBuilder() + val doc = builder.newDocument() + doc.xmlVersion = "1.0" + doc.xmlStandalone = true val root = doc.createElementNS(schema, root) doc.appendChild(root); XmlDOMBuilder(doc, schema, root).f() diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt index aa7d40e3..7bed5ac0 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt @@ -255,7 +255,6 @@ suspend fun ebicsDownload( // Then throw business logic exception if any res.getOrThrow() } - Unit } suspend fun HEV( diff --git a/testbench/src/test/kotlin/Iso20022Test.kt b/testbench/src/test/kotlin/Iso20022Test.kt index 26447b9d..55b5295e 100644 --- a/testbench/src/test/kotlin/Iso20022Test.kt +++ b/testbench/src/test/kotlin/Iso20022Test.kt @@ -42,7 +42,7 @@ class Iso20022Test { @Test fun logs() { val root = Path("test") - if (!root.exists()) return; + if (!root.exists()) return for (platform in root.listDirectoryEntries()) { for (file in platform.listDirectoryEntries()) { val fetch = file.resolve("fetch") -- cgit v1.2.3