ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-23 04:25:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

AttachmentClassLoader isn't directly exposed on the api, so move together with serialisation. (#1060)

Browse Source
This commit is contained in:
Matthew Nesbit 2017-07-17 17:56:02 +01:00 committed by Rick Parker
parent c62387f3f6
commit 8596f1cc17
4 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/kotlin/net/corda/core/node/AttachmentsClassLoader.kt → core/src/main/kotlin/net/corda/core/serialization/AttachmentsClassLoader.kt
View File

@ -1,8 +1,7 @@
package net.corda.core.node package net.corda.core.serialization
import net.corda.core.contracts.Attachment import net.corda.core.contracts.Attachment
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.serialization.CordaSerializable
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException import java.io.FileNotFoundException

1
core/src/main/kotlin/net/corda/core/serialization/CordaClassResolver.kt
View File

@ -6,7 +6,6 @@ import com.esotericsoftware.kryo.io.Output
import com.esotericsoftware.kryo.serializers.FieldSerializer import com.esotericsoftware.kryo.serializers.FieldSerializer
import com.esotericsoftware.kryo.util.DefaultClassResolver import com.esotericsoftware.kryo.util.DefaultClassResolver
import com.esotericsoftware.kryo.util.Util import com.esotericsoftware.kryo.util.Util
import net.corda.core.node.AttachmentsClassLoader
import net.corda.core.utilities.loggerFor import net.corda.core.utilities.loggerFor
import java.io.PrintWriter import java.io.PrintWriter
import java.lang.reflect.Modifier.isAbstract import java.lang.reflect.Modifier.isAbstract

1
core/src/main/kotlin/net/corda/core/serialization/Kryo.kt
View File

@ -11,7 +11,6 @@ import net.corda.core.contracts.*
import net.corda.core.crypto.* import net.corda.core.crypto.*
import net.corda.core.crypto.composite.CompositeKey import net.corda.core.crypto.composite.CompositeKey
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.node.AttachmentsClassLoader
import net.corda.core.transactions.WireTransaction import net.corda.core.transactions.WireTransaction
import net.corda.core.utilities.LazyPool import net.corda.core.utilities.LazyPool
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes

1
core/src/test/kotlin/net/corda/core/serialization/CordaClassResolverTests.kt
View File

@ -5,7 +5,6 @@ import com.esotericsoftware.kryo.io.Input
import com.esotericsoftware.kryo.io.Output import com.esotericsoftware.kryo.io.Output
import com.esotericsoftware.kryo.util.MapReferenceResolver import com.esotericsoftware.kryo.util.MapReferenceResolver
import net.corda.core.node.AttachmentClassLoaderTests import net.corda.core.node.AttachmentClassLoaderTests
import net.corda.core.node.AttachmentsClassLoader
import net.corda.core.node.services.AttachmentStorage import net.corda.core.node.services.AttachmentStorage
import net.corda.testing.node.MockAttachmentStorage import net.corda.testing.node.MockAttachmentStorage
import org.junit.Rule import org.junit.Rule