Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1

serialization/build.gradle

@@ -14,6 +14,8 @@ dependencies {
 
     compile "org.ow2.asm:asm:$asm_version"
 
+    compile "com.google.guava:guava:$guava_version"
+
     // For AMQP serialisation.
     compile "org.apache.qpid:proton-j:$protonj_version"
 

serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt

@@ -534,7 +534,7 @@ private fun Throwable.setMessage(newMsg: String) {
 
 fun ClassWhitelist.requireWhitelisted(type: Type) {
     if (!this.isWhitelisted(type.asClass()!!)) {
-        throw NotSerializableException("Class $type is not on the whitelist or annotated with @CordaSerializable.")
+        throw NotSerializableException("Class \"$type\" is not on the whitelist or annotated with @CordaSerializable.")
     }
 }