Merge ebics and nexus module

22 files changed, 22 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index 864bff0c..004dc256 100644
--- a/Makefile
+++ b/Makefile
@@ -103,10 +103,6 @@ bank-test: install-nobuild-files
 nexus-test: install-nobuild-files
 	./gradlew :nexus:test --tests $(test) -i
 
-.PHONY: ebics-test
-ebics-test: install-nobuild-files
-	./gradlew :ebics:test --tests $(test) -i
-
 .PHONY: common-test
 common-test: install-nobuild-files
 	./gradlew :common:test --tests $(test) -i
diff --git a/ebics/build.gradle b/ebics/build.gradle
deleted file mode 100644
index c50939dc..00000000
--- a/ebics/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-plugins {
-    id("java")
-    id("kotlin")
-}
-
-version = rootProject.version
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-compileKotlin.kotlinOptions.jvmTarget = "17"
-compileTestKotlin.kotlinOptions.jvmTarget = "17"
-
-sourceSets.main.java.srcDirs = ["src/main/kotlin"]
-
-dependencies {
-    implementation(project(":common"))
-
-    implementation("io.ktor:ktor-http:$ktor_version")
-    implementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
-}
\ No newline at end of file
diff --git a/ebics/src/main/resources/version.txt b/ebics/src/main/resources/version.txt
deleted file mode 100644
index 359d0539..00000000
--- a/ebics/src/main/resources/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-v0.9.4-git-8aeffb3f
\ No newline at end of file
diff --git a/nexus/build.gradle b/nexus/build.gradle
index 58e7858f..56eda968 100644
--- a/nexus/build.gradle
+++ b/nexus/build.gradle
@@ -22,7 +22,6 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
 
     implementation(project(":common"))
-    implementation(project(":ebics"))
 
     // Command line parsing
     implementation("com.github.ajalt.clikt:clikt:$clikt_version")
diff --git a/ebics/codegen.py b/nexus/codegen.py
index 7b145662..634a9842 100644
--- a/ebics/codegen.py
+++ b/nexus/codegen.py
@@ -58,7 +58,7 @@ def iso20022codegen():
 
 // THIS FILE IS GENERATED, DO NOT EDIT
 
-package tech.libeufin.ebics
+package tech.libeufin.nexus
 
 {extractCodeSet("ExternalStatusReason1Code", "ExternalStatusReasonCode")}
 
@@ -66,7 +66,7 @@ package tech.libeufin.ebics
 
 {extractCodeSet("ExternalPaymentTransactionStatus1Code", "ExternalPaymentTransactionStatusCode")}
 """
-    with open("src/main/kotlin/Iso20022CodeSets.kt", "w") as file1:
+    with open("src/main/kotlin/tech/libeufin/nexus/Iso20022CodeSets.kt", "w") as file1:
         file1.write(kt)
 
 iso20022codegen()
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
index d6ae13f6..a089012a 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
@@ -27,7 +27,6 @@ import io.ktor.client.*
 import io.ktor.client.plugins.*
 import kotlinx.coroutines.*
 import tech.libeufin.common.*
-import tech.libeufin.ebics.*
 import tech.libeufin.nexus.ebics.*
 import java.io.IOException
 import java.io.InputStream
@@ -307,7 +306,7 @@ private fun ingestDocuments(
 private suspend fun fetchDocuments(
     db: Database,
     ctx: FetchContext,
-    docs: List<Document>
+    docs: List<EbicsDocument>
 ): Boolean {
     val lastExecutionTime: Instant? = ctx.pinnedStart
     return docs.all { doc ->
@@ -334,7 +333,7 @@ private suspend fun fetchDocuments(
     }
 }
 
-enum class Document {
+enum class EbicsDocument {
     /// EBICS acknowledgement - CustomerAcknowledgement HAC pain.002
     acknowledgement,
     /// Payment status - CustomerPaymentStatusReport pain.002
@@ -379,10 +378,10 @@ class EbicsFetch: CliktCommand("Fetches EBICS files") {
         help = "This flag fetches only once from the bank and returns, " +
                 "ignoring the 'frequency' configuration value"
     ).flag(default = false)
-    private val documents: Set<Document> by argument(
+    private val documents: Set<EbicsDocument> by argument(
         help = "Which documents should be fetched? If none are specified, all supported documents will be fetched",
-        helpTags = Document.entries.map { Pair(it.name, it.shortDescription()) }.toMap()
-    ).enum<Document>().multiple().unique()
+        helpTags = EbicsDocument.entries.map { Pair(it.name, it.shortDescription()) }.toMap()
+    ).enum<EbicsDocument>().multiple().unique()
     private val pinnedStart by option(
         help = "Constant YYYY-MM-DD date for the earliest document" +
                 " to download (only consumed in --transient mode).  The" +
@@ -419,7 +418,7 @@ class EbicsFetch: CliktCommand("Fetches EBICS files") {
                 null,
                 FileLogger(ebicsLog)
             )
-            val docs = if (documents.isEmpty()) Document.entries else documents.toList()
+            val docs = if (documents.isEmpty()) EbicsDocument.entries else documents.toList()
             if (transient) {
                 logger.info("Transient mode: fetching once and returning.")
                 val pinnedStartVal = pinnedStart
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt
index d0e1a7f3..58e43e2d 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSetup.kt
@@ -26,7 +26,6 @@ import io.ktor.client.*
 import io.ktor.client.plugins.*
 import tech.libeufin.common.*
 import tech.libeufin.common.crypto.*
-import tech.libeufin.ebics.*
 import tech.libeufin.nexus.ebics.*
 import java.nio.file.*
 import java.time.Instant
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
index 946a1808..e2b673dd 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022.kt
@@ -19,7 +19,6 @@
 package tech.libeufin.nexus
 
 import tech.libeufin.common.*
-import tech.libeufin.ebics.*
 import java.io.InputStream
 import java.net.URLEncoder
 import java.time.*
diff --git a/ebics/src/main/kotlin/Iso20022CodeSets.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022CodeSets.kt
index f5e338df..bc2c7eae 100644
--- a/ebics/src/main/kotlin/Iso20022CodeSets.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022CodeSets.kt
@@ -19,7 +19,7 @@
 
 // THIS FILE IS GENERATED, DO NOT EDIT
 
-package tech.libeufin.ebics
+package tech.libeufin.nexus
 
 enum class ExternalStatusReasonCode(val isoCode: String, val description: String) {
 	AB01("AbortedClearingTimeout", "Clearing process aborted due to timeout."),
diff --git a/ebics/src/main/kotlin/Iso20022Constants.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022Constants.kt
index 961f5f90..abc7bc80 100644
--- a/ebics/src/main/kotlin/Iso20022Constants.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Iso20022Constants.kt
@@ -17,7 +17,7 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.ebics
+package tech.libeufin.nexus
 
 enum class HacAction(val description: String) {
 	FILE_UPLOAD("File submitted to the bank"),
diff --git a/ebics/src/main/kotlin/XMLUtil.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/XMLUtil.kt
index b602adc0..905bd223 100644
--- a/ebics/src/main/kotlin/XMLUtil.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/XMLUtil.kt
@@ -17,11 +17,10 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.ebics
+package tech.libeufin.nexus
 
+import tech.libeufin.nexus.ebics.*
 import io.ktor.http.*
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
@@ -57,8 +56,6 @@ import javax.xml.xpath.XPath
 import javax.xml.xpath.XPathConstants
 import javax.xml.xpath.XPathFactory
 
-private val logger: Logger = LoggerFactory.getLogger("libeufin-xml")
-
 /**
  * This URI dereferencer allows handling the resource reference used for
  * XML signatures in EBICS.
diff --git a/ebics/src/main/kotlin/XmlCombinators.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/XmlCombinators.kt
index 902e21ae..a0d806ec 100644
--- a/ebics/src/main/kotlin/XmlCombinators.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/XmlCombinators.kt
@@ -17,7 +17,7 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.ebics
+package tech.libeufin.nexus
 
 import org.w3c.dom.*
 import java.io.InputStream
diff --git a/ebics/src/main/kotlin/Ebics.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics.kt
index d9639ff5..6cd031ac 100644
--- a/ebics/src/main/kotlin/Ebics.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics.kt
@@ -22,12 +22,13 @@
  * used to implement both an EBICS server and EBICS client.
  */
 
-package tech.libeufin.ebics
+package tech.libeufin.nexus.ebics
 
 import io.ktor.http.*
 import org.w3c.dom.Document
 import tech.libeufin.common.crypto.CryptoUtil
 import tech.libeufin.common.*
+import tech.libeufin.nexus.*
 import java.io.InputStream
 import java.security.SecureRandom
 import java.security.interfaces.RSAPrivateCrtKey
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics2.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics2.kt
index 1fdb4b26..0879d3c3 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics2.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics2.kt
@@ -26,7 +26,7 @@ package tech.libeufin.nexus.ebics
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import tech.libeufin.common.*
-import tech.libeufin.ebics.*
+import tech.libeufin.nexus.*
 import tech.libeufin.nexus.BankPublicKeysFile
 import tech.libeufin.nexus.ClientPrivateKeysFile
 import tech.libeufin.nexus.EbicsSetupConfig
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics3.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics3.kt
index e7df9c83..993c209c 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics3.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/Ebics3.kt
@@ -19,13 +19,9 @@
 package tech.libeufin.nexus.ebics
 
 import io.ktor.client.*
-import tech.libeufin.ebics.*
+import tech.libeufin.nexus.*
 import tech.libeufin.common.*
 import tech.libeufin.common.crypto.*
-import tech.libeufin.nexus.BankPublicKeysFile
-import tech.libeufin.nexus.ClientPrivateKeysFile
-import tech.libeufin.nexus.EbicsSetupConfig
-import tech.libeufin.nexus.logger
 import java.math.BigInteger
 import java.time.*
 import java.time.format.*
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 496006e2..228580d3 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/ebics/EbicsCommon.kt
@@ -45,7 +45,6 @@ import io.ktor.http.*
 import io.ktor.utils.io.jvm.javaio.*
 import tech.libeufin.common.*
 import tech.libeufin.common.crypto.*
-import tech.libeufin.ebics.*
 import tech.libeufin.nexus.*
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
diff --git a/nexus/src/test/kotlin/Ebics.kt b/nexus/src/test/kotlin/Ebics.kt
index 7bd05fa7..e2a2ab84 100644
--- a/nexus/src/test/kotlin/Ebics.kt
+++ b/nexus/src/test/kotlin/Ebics.kt
@@ -20,7 +20,7 @@
 import io.ktor.client.engine.mock.*
 import io.ktor.http.*
 import org.junit.Test
-import tech.libeufin.ebics.XMLUtil
+import tech.libeufin.nexus.*
 import tech.libeufin.nexus.ebics.*
 import kotlin.io.path.Path
 import kotlin.io.path.writeBytes
diff --git a/ebics/src/test/kotlin/XmlCombinatorsTest.kt b/nexus/src/test/kotlin/XmlCombinatorsTest.kt
index 7e7efb65..b14920e3 100644
--- a/ebics/src/test/kotlin/XmlCombinatorsTest.kt
+++ b/nexus/src/test/kotlin/XmlCombinatorsTest.kt
@@ -18,8 +18,8 @@
  */
 
 import org.junit.Test
-import tech.libeufin.ebics.XmlBuilder
-import tech.libeufin.ebics.XMLUtil
+import tech.libeufin.nexus.XmlBuilder
+import tech.libeufin.nexus.XMLUtil
 import kotlin.test.assertEquals
 
 class XmlCombinatorsTest {
diff --git a/ebics/src/test/kotlin/XmlUtilTest.kt b/nexus/src/test/kotlin/XmlUtilTest.kt
index 1ec63538..f847c928 100644
--- a/ebics/src/test/kotlin/XmlUtilTest.kt
+++ b/nexus/src/test/kotlin/XmlUtilTest.kt
@@ -21,7 +21,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Test
 import tech.libeufin.common.crypto.CryptoUtil
 import tech.libeufin.common.decodeBase64
-import tech.libeufin.ebics.XMLUtil
+import tech.libeufin.nexus.XMLUtil
 import java.security.KeyPairGenerator
 import javax.xml.transform.stream.StreamSource
 
diff --git a/ebics/src/test/resources/signature1/doc.xml b/nexus/src/test/resources/signature1/doc.xml
index 271f8429..271f8429 100644
--- a/ebics/src/test/resources/signature1/doc.xml
+++ b/nexus/src/test/resources/signature1/doc.xml
diff --git a/ebics/src/test/resources/signature1/public_key.txt b/nexus/src/test/resources/signature1/public_key.txt
index 6d52df58..6d52df58 100644
--- a/ebics/src/test/resources/signature1/public_key.txt
+++ b/nexus/src/test/resources/signature1/public_key.txt
diff --git a/settings.gradle b/settings.gradle
index 48e088f8..310fbee3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,5 +2,4 @@ rootProject.name = 'libeufin'
 include("bank")
 include("nexus")
 include("common")
-include("testbench")
-include("ebics")
\ No newline at end of file
+include("testbench")
\ No newline at end of file