Improve package hierarchyv0.9.3-dev.34

23 files changed, 53 insertions, 26 deletions

diff --git a/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt b/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt
index ff3e9105..11f791aa 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt
@@ -27,7 +27,8 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.http.*
 import net.taler.common.errorcodes.TalerErrorCode
-import tech.libeufin.bank.WithdrawalDAO.*
+import tech.libeufin.bank.db.*
+import tech.libeufin.bank.db.WithdrawalDAO.*
 import java.lang.AssertionError
 
 fun Routing.bankIntegrationApi(db: Database, ctx: BankConfig) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/ConversionApi.kt b/bank/src/main/kotlin/tech/libeufin/bank/ConversionApi.kt
index ba6748b4..d9e88942 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/ConversionApi.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/ConversionApi.kt
@@ -25,7 +25,9 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.util.*
 import tech.libeufin.util.*
-import tech.libeufin.bank.ConversionDAO.*
+import tech.libeufin.bank.auth.*
+import tech.libeufin.bank.db.ConversionDAO.*
+import tech.libeufin.bank.db.*
 import net.taler.common.errorcodes.TalerErrorCode
 
 fun Routing.conversionApi(db: Database, ctx: BankConfig) = conditional(ctx.allowConversion) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/CoreBankApi.kt b/bank/src/main/kotlin/tech/libeufin/bank/CoreBankApi.kt
index 58fb208a..bc8b88b6 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/CoreBankApi.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/CoreBankApi.kt
@@ -35,11 +35,13 @@ import net.taler.common.errorcodes.TalerErrorCode
 import net.taler.wallet.crypto.Base32Crockford
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import tech.libeufin.bank.AccountDAO.*
-import tech.libeufin.bank.CashoutDAO.*
-import tech.libeufin.bank.ExchangeDAO.*
-import tech.libeufin.bank.TransactionDAO.*
-import tech.libeufin.bank.WithdrawalDAO.*
+import tech.libeufin.bank.auth.*
+import tech.libeufin.bank.db.*
+import tech.libeufin.bank.db.AccountDAO.*
+import tech.libeufin.bank.db.CashoutDAO.*
+import tech.libeufin.bank.db.ExchangeDAO.*
+import tech.libeufin.bank.db.TransactionDAO.*
+import tech.libeufin.bank.db.WithdrawalDAO.*
 import tech.libeufin.util.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.bank.accountsMgmtHandlers")
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
index 908c3234..50d47429 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
@@ -54,7 +54,8 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.slf4j.event.Level
 import org.postgresql.util.PSQLState
-import tech.libeufin.bank.AccountDAO.*
+import tech.libeufin.bank.db.AccountDAO.*
+import tech.libeufin.bank.db.*
 import tech.libeufin.util.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.bank.Main")
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/RevenueApi.kt b/bank/src/main/kotlin/tech/libeufin/bank/RevenueApi.kt
index 6a5f7238..4575b106 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/RevenueApi.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/RevenueApi.kt
@@ -25,6 +25,8 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.util.*
 import tech.libeufin.util.*
+import tech.libeufin.bank.auth.*
+import tech.libeufin.bank.db.*
 
 fun Routing.revenueApi(db: Database) { 
     auth(db, TokenScope.readonly) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/WireGatewayApi.kt b/bank/src/main/kotlin/tech/libeufin/bank/WireGatewayApi.kt
index 67de9f06..4da9a3ab 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/WireGatewayApi.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/WireGatewayApi.kt
@@ -31,7 +31,9 @@ import java.time.Instant
 import net.taler.common.errorcodes.TalerErrorCode
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import tech.libeufin.bank.ExchangeDAO.*
+import tech.libeufin.bank.db.*
+import tech.libeufin.bank.db.ExchangeDAO.*
+import tech.libeufin.bank.auth.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.nexus")
 
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Authentication.kt b/bank/src/main/kotlin/tech/libeufin/bank/auth/auth.kt
index 7f0fac7b..edb8e305 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/Authentication.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/auth/auth.kt
@@ -16,7 +16,7 @@
  * License along with LibEuFin; see the file COPYING.  If not, see
  * <http://www.gnu.org/licenses/>
  */
-package tech.libeufin.bank
+package tech.libeufin.bank.auth
 
 import io.ktor.http.*
 import io.ktor.server.application.*
@@ -29,7 +29,9 @@ import net.taler.common.errorcodes.TalerErrorCode
 import net.taler.wallet.crypto.Base32Crockford
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import tech.libeufin.bank.AccountDAO.*
+import tech.libeufin.bank.db.AccountDAO.*
+import tech.libeufin.bank.db.*
+import tech.libeufin.bank.*
 import tech.libeufin.util.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.bank.Authentication")
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/AccountDAO.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/AccountDAO.kt
index 5743eb8a..fac65264 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/AccountDAO.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/AccountDAO.kt
@@ -17,11 +17,12 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import tech.libeufin.util.*
 import java.time.*
 import java.sql.Types
+import tech.libeufin.bank.*
 
 /** Data access logic for accounts */
 class AccountDAO(private val db: Database) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/CashoutDAO.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/CashoutDAO.kt
index d5c89c55..bf8be4fb 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/CashoutDAO.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/CashoutDAO.kt
@@ -17,12 +17,13 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import java.time.Duration
 import java.time.Instant
 import java.util.concurrent.TimeUnit
 import tech.libeufin.util.*
+import tech.libeufin.bank.*
 
 /** Data access logic for cashout operations */
 class CashoutDAO(private val db: Database) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/ConversionDAO.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/ConversionDAO.kt
index 7cd43dd4..b2d521c7 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/ConversionDAO.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/ConversionDAO.kt
@@ -17,10 +17,11 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import tech.libeufin.util.*
 import tech.libeufin.bank.*
+import tech.libeufin.bank.*
 
 /** Data access logic for conversion */
 class ConversionDAO(private val db: Database) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/Database.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/Database.kt
index be1dd340..8ea2f00a 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/Database.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/Database.kt
@@ -17,7 +17,7 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import org.postgresql.jdbc.PgConnection
 import org.postgresql.ds.PGSimpleDataSource
@@ -36,6 +36,7 @@ import com.zaxxer.hikari.*
 import tech.libeufin.util.*
 import io.ktor.http.HttpStatusCode
 import net.taler.common.errorcodes.TalerErrorCode
+import tech.libeufin.bank.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.bank.Database")
 
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/ExchangeDAO.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/ExchangeDAO.kt
index 236c60c3..44cb272c 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/ExchangeDAO.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/ExchangeDAO.kt
@@ -17,13 +17,14 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import java.util.UUID
 import java.time.Instant
 import java.time.Duration
 import java.util.concurrent.TimeUnit
 import tech.libeufin.util.*
+import tech.libeufin.bank.*
 
 /** Data access logic for exchange specific logic */
 class ExchangeDAO(private val db: Database) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/NotificationWatcher.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/NotificationWatcher.kt
index 65776f52..c96a1e5d 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/NotificationWatcher.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/NotificationWatcher.kt
@@ -17,7 +17,7 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -27,6 +27,7 @@ import org.postgresql.ds.PGSimpleDataSource
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import tech.libeufin.util.*
+import tech.libeufin.bank.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.util.NotificationWatcher")
 
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/TokenDAO.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/TokenDAO.kt
index 19c214cc..d3754938 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/TokenDAO.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/TokenDAO.kt
@@ -17,10 +17,11 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import tech.libeufin.util.*
 import java.time.Instant
+import tech.libeufin.bank.*
 
 /** Data access logic for auth tokens */
 class TokenDAO(private val db: Database) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/TransactionDAO.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/TransactionDAO.kt
index df50a1a5..1485ec52 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/TransactionDAO.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/TransactionDAO.kt
@@ -17,13 +17,14 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import tech.libeufin.util.*
 import java.time.*
 import java.sql.Types
+import tech.libeufin.bank.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.util.TransactionDAO")
 
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/db/WithdrawalDAO.kt b/bank/src/main/kotlin/tech/libeufin/bank/db/WithdrawalDAO.kt
index bc0b49ce..4da52776 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/db/WithdrawalDAO.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/db/WithdrawalDAO.kt
@@ -17,7 +17,7 @@
  * <http://www.gnu.org/licenses/>
  */
 
-package tech.libeufin.bank
+package tech.libeufin.bank.db
 
 import java.util.UUID
 import java.time.Instant
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit
 import tech.libeufin.util.*
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.*
+import tech.libeufin.bank.*
 
 /** Data access logic for withdrawal operations */
 class WithdrawalDAO(private val db: Database) {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt b/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt
index 36c49f1f..85dd8ff2 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt
@@ -36,8 +36,10 @@ import java.util.*
 import net.taler.common.errorcodes.TalerErrorCode
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import tech.libeufin.bank.AccountDAO.*
 import tech.libeufin.util.*
+import tech.libeufin.bank.db.*
+import tech.libeufin.bank.db.AccountDAO.*
+import tech.libeufin.bank.auth.*
 
 private val logger: Logger = LoggerFactory.getLogger("tech.libeufin.bank.helpers")
 
diff --git a/bank/src/test/kotlin/AmountTest.kt b/bank/src/test/kotlin/AmountTest.kt
index c265db5a..dbc920ef 100644
--- a/bank/src/test/kotlin/AmountTest.kt
+++ b/bank/src/test/kotlin/AmountTest.kt
@@ -23,8 +23,9 @@ import kotlin.test.*
 import org.junit.Test
 import org.postgresql.jdbc.PgConnection
 import tech.libeufin.bank.*
-import tech.libeufin.bank.TransactionDAO.*
-import tech.libeufin.bank.WithdrawalDAO.*
+import tech.libeufin.bank.db.*
+import tech.libeufin.bank.db.TransactionDAO.*
+import tech.libeufin.bank.db.WithdrawalDAO.*
 import tech.libeufin.util.*
 
 class AmountTest {
diff --git a/bank/src/test/kotlin/BankIntegrationApiTest.kt b/bank/src/test/kotlin/BankIntegrationApiTest.kt
index ac1bcefb..dd7cce4e 100644
--- a/bank/src/test/kotlin/BankIntegrationApiTest.kt
+++ b/bank/src/test/kotlin/BankIntegrationApiTest.kt
@@ -29,6 +29,7 @@ import kotlinx.serialization.json.*
 import net.taler.common.errorcodes.TalerErrorCode
 import org.junit.Test
 import tech.libeufin.bank.*
+import tech.libeufin.bank.db.*
 import tech.libeufin.util.*
 
 class BankIntegrationApiTest {
diff --git a/bank/src/test/kotlin/CoreBankApiTest.kt b/bank/src/test/kotlin/CoreBankApiTest.kt
index 7f101c82..ca538da4 100644
--- a/bank/src/test/kotlin/CoreBankApiTest.kt
+++ b/bank/src/test/kotlin/CoreBankApiTest.kt
@@ -34,6 +34,7 @@ import net.taler.common.errorcodes.TalerErrorCode
 import net.taler.wallet.crypto.Base32Crockford
 import org.junit.Test
 import tech.libeufin.bank.*
+import tech.libeufin.bank.db.*
 import tech.libeufin.util.*
 
 class CoreBankConfigTest {
diff --git a/bank/src/test/kotlin/DatabaseTest.kt b/bank/src/test/kotlin/DatabaseTest.kt
index 916e637a..81c4c813 100644
--- a/bank/src/test/kotlin/DatabaseTest.kt
+++ b/bank/src/test/kotlin/DatabaseTest.kt
@@ -29,7 +29,7 @@ import kotlin.test.*
 import kotlinx.coroutines.*
 import org.junit.Test
 import tech.libeufin.bank.*
-import tech.libeufin.bank.AccountDAO.*
+import tech.libeufin.bank.db.AccountDAO.*
 import tech.libeufin.util.*
 
 class DatabaseTest {
diff --git a/bank/src/test/kotlin/helpers.kt b/bank/src/test/kotlin/helpers.kt
index fc996014..c35dc721 100644
--- a/bank/src/test/kotlin/helpers.kt
+++ b/bank/src/test/kotlin/helpers.kt
@@ -31,7 +31,8 @@ import kotlinx.serialization.json.*
 import net.taler.common.errorcodes.TalerErrorCode
 import net.taler.wallet.crypto.Base32Crockford
 import tech.libeufin.bank.*
-import tech.libeufin.bank.AccountDAO.*
+import tech.libeufin.bank.db.*
+import tech.libeufin.bank.db.AccountDAO.*
 import tech.libeufin.util.*
 
 /* ----- Setup ----- */
diff --git a/integration/test/IntegrationTest.kt b/integration/test/IntegrationTest.kt
index ae148d85..e5766a61 100644
--- a/integration/test/IntegrationTest.kt
+++ b/integration/test/IntegrationTest.kt
@@ -23,7 +23,7 @@ import tech.libeufin.bank.TalerAmount as BankAmount
 import tech.libeufin.nexus.*
 import tech.libeufin.nexus.Database as NexusDb
 import tech.libeufin.nexus.TalerAmount as NexusAmount
-import tech.libeufin.bank.AccountDAO.*
+import tech.libeufin.bank.db.AccountDAO.*
 import tech.libeufin.util.*
 import java.io.File
 import java.time.Instant