From 8596f1cc17a607b3472dc2fcb08d466621005e4d Mon Sep 17 00:00:00 2001
From: Matthew Nesbit <matthew.nesbit@r3cev.com>
Date: Mon, 17 Jul 2017 17:56:02 +0100
Subject: [PATCH] AttachmentClassLoader isn't directly exposed on the api, so
 move together with serialisation. (#1060)

---
 .../core/{node => serialization}/AttachmentsClassLoader.kt     | 3 +--
 .../kotlin/net/corda/core/serialization/CordaClassResolver.kt  | 1 -
 core/src/main/kotlin/net/corda/core/serialization/Kryo.kt      | 1 -
 .../net/corda/core/serialization/CordaClassResolverTests.kt    | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)
 rename core/src/main/kotlin/net/corda/core/{node => serialization}/AttachmentsClassLoader.kt (98%)

diff --git a/core/src/main/kotlin/net/corda/core/node/AttachmentsClassLoader.kt b/core/src/main/kotlin/net/corda/core/serialization/AttachmentsClassLoader.kt
similarity index 98%
rename from core/src/main/kotlin/net/corda/core/node/AttachmentsClassLoader.kt
rename to core/src/main/kotlin/net/corda/core/serialization/AttachmentsClassLoader.kt
index bd76fd8bbc..d179ab6e25 100644
--- a/core/src/main/kotlin/net/corda/core/node/AttachmentsClassLoader.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/AttachmentsClassLoader.kt
@@ -1,8 +1,7 @@
-package net.corda.core.node
+package net.corda.core.serialization
 
 import net.corda.core.contracts.Attachment
 import net.corda.core.crypto.SecureHash
-import net.corda.core.serialization.CordaSerializable
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.FileNotFoundException
diff --git a/core/src/main/kotlin/net/corda/core/serialization/CordaClassResolver.kt b/core/src/main/kotlin/net/corda/core/serialization/CordaClassResolver.kt
index 864167b91e..2ab25299fb 100644
--- a/core/src/main/kotlin/net/corda/core/serialization/CordaClassResolver.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/CordaClassResolver.kt
@@ -6,7 +6,6 @@ import com.esotericsoftware.kryo.io.Output
 import com.esotericsoftware.kryo.serializers.FieldSerializer
 import com.esotericsoftware.kryo.util.DefaultClassResolver
 import com.esotericsoftware.kryo.util.Util
-import net.corda.core.node.AttachmentsClassLoader
 import net.corda.core.utilities.loggerFor
 import java.io.PrintWriter
 import java.lang.reflect.Modifier.isAbstract
diff --git a/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt b/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt
index 27b03c66ac..8db0fdbd8a 100644
--- a/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt
@@ -11,7 +11,6 @@ import net.corda.core.contracts.*
 import net.corda.core.crypto.*
 import net.corda.core.crypto.composite.CompositeKey
 import net.corda.core.identity.Party
-import net.corda.core.node.AttachmentsClassLoader
 import net.corda.core.transactions.WireTransaction
 import net.corda.core.utilities.LazyPool
 import net.corda.core.utilities.OpaqueBytes
diff --git a/core/src/test/kotlin/net/corda/core/serialization/CordaClassResolverTests.kt b/core/src/test/kotlin/net/corda/core/serialization/CordaClassResolverTests.kt
index 46d4aa7499..a3eb22da91 100644
--- a/core/src/test/kotlin/net/corda/core/serialization/CordaClassResolverTests.kt
+++ b/core/src/test/kotlin/net/corda/core/serialization/CordaClassResolverTests.kt
@@ -5,7 +5,6 @@ import com.esotericsoftware.kryo.io.Input
 import com.esotericsoftware.kryo.io.Output
 import com.esotericsoftware.kryo.util.MapReferenceResolver
 import net.corda.core.node.AttachmentClassLoaderTests
-import net.corda.core.node.AttachmentsClassLoader
 import net.corda.core.node.services.AttachmentStorage
 import net.corda.testing.node.MockAttachmentStorage
 import org.junit.Rule