[libeufin] 02/02: avoid NULL primary key

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository libeufin.

commit 7ce7b83e2dbbaff530e74b4b5006b742471d59f8
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jan 29 09:23:41 2020 +0100

    avoid NULL primary key
---
 nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt          | 1 -
 nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt        | 3 ++-
 sandbox/build.gradle                                     | 1 -
 sandbox/src/main/python/libeufin-cli                     | 4 ++--
 util/build.gradle                                        | 9 +--------
 util/src/test/{resources => kotlin}/EbicsMessagesTest.kt | 1 +
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
index f399ee7..625ea57 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
@@ -26,7 +26,6 @@ object EbicsSubscribersTable : IdTable<String>() {
 class EbicsSubscriberEntity(id: EntityID<String>) : Entity<String>(id) {
 
     companion object : EntityClass<String, 
EbicsSubscriberEntity>(EbicsSubscribersTable)
-
     var ebicsURL by EbicsSubscribersTable.ebicsURL
     var hostID by EbicsSubscribersTable.hostID
     var partnerID by EbicsSubscribersTable.partnerID
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index 467bc81..cc4bec5 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -38,6 +38,7 @@ import io.ktor.response.respondText
 import io.ktor.routing.*
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
+import org.jetbrains.exposed.dao.EntityID
 import org.jetbrains.exposed.sql.StdOutSqlLogger
 import org.jetbrains.exposed.sql.addLogger
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -69,7 +70,7 @@ fun testData() {
 
     transaction {
         addLogger(StdOutSqlLogger)
-        EbicsSubscriberEntity.new {
+        EbicsSubscriberEntity.new(id = "default-customer") {
             ebicsURL = "http://localhost:5000/ebicsweb";
             userID = "USER1"
             partnerID = "PARTNER1"
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index b1fdee3..90f5243 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -50,7 +50,6 @@ dependencies {
 
 
 application {
-
     mainClassName = "tech.libeufin.sandbox.MainKt"
 }
 
diff --git a/sandbox/src/main/python/libeufin-cli 
b/sandbox/src/main/python/libeufin-cli
index 7ef4625..27ebe68 100755
--- a/sandbox/src/main/python/libeufin-cli
+++ b/sandbox/src/main/python/libeufin-cli
@@ -342,7 +342,7 @@ def sync(obj, customer_id):
     print(resp.content.decode("utf-8"))
 
 
-@ebics.command(help="Retrieve all subscribers in the system")
+@ebics.command(help="Retrieve all the customers managed by Nexus")
 @click.pass_obj
 def subscribers(obj):
     
@@ -350,7 +350,7 @@ def subscribers(obj):
     try:
         resp = get(url)
     except Exception:
-        print("Could not reach the bank")
+        print("Could not reach Nexus at {}".format(url))
         return
 
     print(resp.content.decode("utf-8"))
diff --git a/util/build.gradle b/util/build.gradle
index d9efa8d..7e68386 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -4,12 +4,10 @@ plugins {
     id 'application'
 }
 
-
 sourceCompatibility = "11"
 targetCompatibility = "11"
 version '1.0-snapshot'
 
-
 compileKotlin {
 
     kotlinOptions {
@@ -46,9 +44,4 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.3.50'
     testImplementation 'org.jetbrains.kotlin:kotlin-test:1.3.50'
-}
-
-application {
-    mainClassName = "tech.libeufin.util.MainKt"
-}
-
+}
\ No newline at end of file
diff --git a/util/src/test/resources/EbicsMessagesTest.kt 
b/util/src/test/kotlin/EbicsMessagesTest.kt
similarity index 99%
rename from util/src/test/resources/EbicsMessagesTest.kt
rename to util/src/test/kotlin/EbicsMessagesTest.kt
index f748fbb..a8b5ab6 100644
--- a/util/src/test/resources/EbicsMessagesTest.kt
+++ b/util/src/test/kotlin/EbicsMessagesTest.kt
@@ -22,6 +22,7 @@ class EbicsMessagesTest {
     fun testImportNonRoot() {
         val classLoader = ClassLoader.getSystemClassLoader()
         val ini = classLoader.getResource("<?xml version=\"1.0\" 
encoding=\"utf-8\"?>\n<SignaturePubKeyOrderData 
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; 
xsi:schemaLocation=\"http://www.ebics.org/S001 
http://www.ebics.org/S001/ebics_signature.xsd\"; 
xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"; 
xmlns=\"http://www.ebics.org/S001\";>\n  <SignaturePubKeyInfo>\n    
<PubKeyValue>\n      <ds:RSAKeyValue>\n        
<ds:Modulus>s5ktpg3xGjbZZgVTYtW+0e6xsWg142UwvoM3mfuM+qrkIa5bPUGQLH [...]
+        assert(ini != null)
         val jaxb = 
XMLUtil.convertStringToJaxb<SignatureTypes.SignaturePubKeyOrderData>(ini.readText())
         assertEquals("A006", jaxb.value.signaturePubKeyInfo.signatureVersion)
     }

-- 
To stop receiving notification emails like this one, please contact
address@hidden.