From 40f791a5d033c01c6db8483c38e0307c2be27278 Mon Sep 17 00:00:00 2001
From: Shams Asari <shams.asari@r3.com>
Date: Sun, 10 Sep 2017 12:13:10 +0100
Subject: [PATCH] Moved X500Name hiberate converter out of core

---
 ...bstractPartyToX500NameAsStringConverter.kt | 19 ++++++++-----------
 .../persistence/HibernateConfiguration.kt     |  1 -
 2 files changed, 8 insertions(+), 12 deletions(-)
 rename {core/src/main/kotlin/net/corda/core/schemas/converters => node/src/main/kotlin/net/corda/node/services/persistence}/AbstractPartyToX500NameAsStringConverter.kt (74%)

diff --git a/core/src/main/kotlin/net/corda/core/schemas/converters/AbstractPartyToX500NameAsStringConverter.kt b/node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
similarity index 74%
rename from core/src/main/kotlin/net/corda/core/schemas/converters/AbstractPartyToX500NameAsStringConverter.kt
rename to node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
index 056eb3becf..14942ce2ec 100644
--- a/core/src/main/kotlin/net/corda/core/schemas/converters/AbstractPartyToX500NameAsStringConverter.kt
+++ b/node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
@@ -1,4 +1,4 @@
-package net.corda.core.schemas.converters
+package net.corda.node.services.persistence
 
 import net.corda.core.identity.AbstractParty
 import net.corda.core.node.services.IdentityService
@@ -13,29 +13,26 @@ import javax.persistence.Converter
  */
 @Converter(autoApply = true)
 class AbstractPartyToX500NameAsStringConverter(identitySvc: () -> IdentityService) : AttributeConverter<AbstractParty, String> {
-
-    private val identityService: IdentityService by lazy {
-        identitySvc()
-    }
-
     companion object {
-        val log = loggerFor<AbstractPartyToX500NameAsStringConverter>()
+        private val log = loggerFor<AbstractPartyToX500NameAsStringConverter>()
     }
 
+    private val identityService: IdentityService by lazy(identitySvc)
+
     override fun convertToDatabaseColumn(party: AbstractParty?): String? {
-        party?.let {
+        if (party != null) {
             val partyName = identityService.partyFromAnonymous(party)?.toString()
             if (partyName != null) return partyName
-            else log.warn ("Identity service unable to resolve AbstractParty: $party")
+            log.warn("Identity service unable to resolve AbstractParty: $party")
         }
         return null // non resolvable anonymous parties
     }
 
     override fun convertToEntityAttribute(dbData: String?): AbstractParty? {
-        dbData?.let {
+        if (dbData != null) {
             val party = identityService.partyFromX500Name(X500Name(dbData))
             if (party != null) return party
-            else log.warn ("Identity service unable to resolve X500name: $dbData")
+            log.warn ("Identity service unable to resolve X500name: $dbData")
         }
         return null // non resolvable anonymous parties are stored as nulls
     }
diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/HibernateConfiguration.kt b/node/src/main/kotlin/net/corda/node/services/persistence/HibernateConfiguration.kt
index 4d194f9f90..cbec0c793c 100644
--- a/node/src/main/kotlin/net/corda/node/services/persistence/HibernateConfiguration.kt
+++ b/node/src/main/kotlin/net/corda/node/services/persistence/HibernateConfiguration.kt
@@ -3,7 +3,6 @@ package net.corda.node.services.persistence
 import net.corda.core.internal.castIfPossible
 import net.corda.core.node.services.IdentityService
 import net.corda.core.schemas.MappedSchema
-import net.corda.core.schemas.converters.AbstractPartyToX500NameAsStringConverter
 import net.corda.core.utilities.loggerFor
 import net.corda.core.utilities.toHexString
 import net.corda.node.services.api.SchemaService