From f718acb939ad4a3a138d20cf5f9352e110c9d5c8 Mon Sep 17 00:00:00 2001
From: Shams Asari <shams.asari@r3.com>
Date: Fri, 7 Jul 2017 12:49:54 +0100
Subject: [PATCH] Moved CordaException.kt to base core package

---
 .../kotlin/net/corda/core/{utilities => }/CordaException.kt   | 2 +-
 core/src/main/kotlin/net/corda/core/flows/FlowException.kt    | 4 ++--
 .../core/serialization/amqp/custom/ThrowableSerializer.kt     | 4 ++--
 .../corda/core/serialization/amqp/SerializationOutputTests.kt | 2 +-
 node-api/src/main/kotlin/net/corda/nodeapi/RPCStructures.kt   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename core/src/main/kotlin/net/corda/core/{utilities => }/CordaException.kt (99%)

diff --git a/core/src/main/kotlin/net/corda/core/utilities/CordaException.kt b/core/src/main/kotlin/net/corda/core/CordaException.kt
similarity index 99%
rename from core/src/main/kotlin/net/corda/core/utilities/CordaException.kt
rename to core/src/main/kotlin/net/corda/core/CordaException.kt
index 907bbee408..49ed6b6975 100644
--- a/core/src/main/kotlin/net/corda/core/utilities/CordaException.kt
+++ b/core/src/main/kotlin/net/corda/core/CordaException.kt
@@ -1,4 +1,4 @@
-package net.corda.core.utilities
+package net.corda.core
 
 import net.corda.core.serialization.CordaSerializable
 import java.util.*
diff --git a/core/src/main/kotlin/net/corda/core/flows/FlowException.kt b/core/src/main/kotlin/net/corda/core/flows/FlowException.kt
index 153baeae46..e527f22c55 100644
--- a/core/src/main/kotlin/net/corda/core/flows/FlowException.kt
+++ b/core/src/main/kotlin/net/corda/core/flows/FlowException.kt
@@ -1,7 +1,7 @@
 package net.corda.core.flows
 
-import net.corda.core.utilities.CordaException
-import net.corda.core.utilities.CordaRuntimeException
+import net.corda.core.CordaException
+import net.corda.core.CordaRuntimeException
 
 // DOCSTART 1
 /**
diff --git a/core/src/main/kotlin/net/corda/core/serialization/amqp/custom/ThrowableSerializer.kt b/core/src/main/kotlin/net/corda/core/serialization/amqp/custom/ThrowableSerializer.kt
index ed267ed44d..7196667a41 100644
--- a/core/src/main/kotlin/net/corda/core/serialization/amqp/custom/ThrowableSerializer.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/amqp/custom/ThrowableSerializer.kt
@@ -4,8 +4,8 @@ import net.corda.core.serialization.amqp.CustomSerializer
 import net.corda.core.serialization.amqp.SerializerFactory
 import net.corda.core.serialization.amqp.constructorForDeserialization
 import net.corda.core.serialization.amqp.propertiesForSerialization
-import net.corda.core.utilities.CordaRuntimeException
-import net.corda.core.utilities.CordaThrowable
+import net.corda.core.CordaRuntimeException
+import net.corda.core.CordaThrowable
 import java.io.NotSerializableException
 
 class ThrowableSerializer(factory: SerializerFactory) : CustomSerializer.Proxy<Throwable, ThrowableSerializer.ThrowableProxy>(Throwable::class.java, ThrowableProxy::class.java, factory) {
diff --git a/core/src/test/kotlin/net/corda/core/serialization/amqp/SerializationOutputTests.kt b/core/src/test/kotlin/net/corda/core/serialization/amqp/SerializationOutputTests.kt
index 52e7ca29a8..54771ac805 100644
--- a/core/src/test/kotlin/net/corda/core/serialization/amqp/SerializationOutputTests.kt
+++ b/core/src/test/kotlin/net/corda/core/serialization/amqp/SerializationOutputTests.kt
@@ -7,7 +7,7 @@ import net.corda.core.identity.AbstractParty
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.serialization.EmptyWhitelist
 import net.corda.core.serialization.KryoAMQPSerializer
-import net.corda.core.utilities.CordaRuntimeException
+import net.corda.core.CordaRuntimeException
 import net.corda.nodeapi.RPCException
 import net.corda.testing.MEGA_CORP
 import net.corda.testing.MEGA_CORP_PUBKEY
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/RPCStructures.kt b/node-api/src/main/kotlin/net/corda/nodeapi/RPCStructures.kt
index e5f279c692..0b5236f68f 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/RPCStructures.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/RPCStructures.kt
@@ -9,7 +9,7 @@ import net.corda.core.requireExternal
 import net.corda.core.serialization.*
 import net.corda.core.toFuture
 import net.corda.core.toObservable
-import net.corda.core.utilities.CordaRuntimeException
+import net.corda.core.CordaRuntimeException
 import net.corda.nodeapi.config.OldConfig
 import rx.Observable
 import java.io.InputStream