CORDA-1709 - The MVP blob inspector, able to inspect network service blobs (#3503)

* Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) (#3102)

Also deprecated all the public members that shouldn't have leaked into the public API.

(cherry picked from commit 3bb95c3)

* CORDA-1238: Updated JacksonSupport to support SerializedBytes, CertPath, X509Certificate and the signature classes (#3145)

SerializedBytes are first converted to the object it represents before being serialised as a pojo.

These changes will be needed to support the the blob inspector when it will output to YAML/JSON.

(cherry picked from commit b031e66)

* Cherry picked part of commit 824adca to port over *only* the JackSupport refactoring.

* CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224)

The existing output format was not complete and so was deleted to avoid it becoming a tech debt. We can always resurrect it at a later point.

(cherry picked from commit 4e0378d)

* Added back support for parsing OpaqueBytes as UTF-8 strings in JacksonSupport (#3240)

(cherry picked from commit d772bc8)

* Cleaned up blob inspector doc (#3284)

(cherry picked from commit b7fbebb)

* Blobinspector: trace level logging with --verbose (#3313)

(cherry picked from commit 6a2e50b)

* Cherry picked part of commit 3046843 to fix issue with --version

* Fixes to the api file

node/build.gradle

@@ -88,7 +88,7 @@ dependencies {
     compile "org.fusesource.jansi:jansi:$jansi_version"
 
     // Manifests: for reading stuff from the manifest file
-    compile "com.jcabi:jcabi-manifests:1.1"
+    compile "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
 
     compile("com.intellij:forms_rt:7.0.3") {
         exclude group: "asm"
@@ -96,7 +96,6 @@ dependencies {
 
     // Jackson support: serialisation to/from JSON, YAML, etc
     compile project(':client:jackson')
-    compile group: 'org.json', name: 'json', version: json_version
 
     // Coda Hale's Metrics: for monitoring of key statistics
     compile "io.dropwizard.metrics:metrics-core:3.1.2"

node/src/main/kotlin/net/corda/node/shell/InteractiveShell.kt

@@ -14,7 +14,6 @@ import net.corda.core.concurrent.CordaFuture
 import net.corda.core.contracts.UniqueIdentifier
 import net.corda.core.flows.FlowLogic
 import net.corda.core.identity.CordaX500Name
-import net.corda.core.identity.Party
 import net.corda.core.internal.*
 import net.corda.core.internal.concurrent.doneFuture
 import net.corda.core.internal.concurrent.openFuture
@@ -22,9 +21,7 @@ import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.DataFeed
 import net.corda.core.messaging.FlowProgressHandle
 import net.corda.core.messaging.StateMachineUpdate
-import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.IdentityService
-import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.node.internal.Node
 import net.corda.node.internal.StartedNode
 import net.corda.node.internal.security.AdminSubject
@@ -54,7 +51,6 @@ import org.crsh.util.Utils
 import org.crsh.vfs.FS
 import org.crsh.vfs.spi.file.FileMountFactory
 import org.crsh.vfs.spi.url.ClassPathMountFactory
-import org.json.JSONObject
 import org.slf4j.LoggerFactory
 import rx.Observable
 import rx.Subscriber
@@ -191,43 +187,22 @@ object InteractiveShell {
         // Return a standard Corda Jackson object mapper, configured to use YAML by default and with extra
         // serializers.
         JacksonSupport.createInMemoryMapper(identityService, YAMLFactory(), true).apply {
-            val rpcModule = SimpleModule()
-            rpcModule.addDeserializer(InputStream::class.java, InputStreamDeserializer)
-            rpcModule.addDeserializer(UniqueIdentifier::class.java, UniqueIdentifierDeserializer)
-            rpcModule.addDeserializer(UUID::class.java, UUIDDeserializer)
+            val rpcModule = SimpleModule().apply {
+                addDeserializer(InputStream::class.java, InputStreamDeserializer)
+                addDeserializer(UniqueIdentifier::class.java, UniqueIdentifierDeserializer)
+            }
             registerModule(rpcModule)
         }
     }
 
-    private object NodeInfoSerializer : JsonSerializer<NodeInfo>() {
-
-        override fun serialize(nodeInfo: NodeInfo, gen: JsonGenerator, serializers: SerializerProvider) {
-
-            val json = JSONObject()
-            json["addresses"] = nodeInfo.addresses.map { address -> address.serialise() }
-            json["legalIdentities"] = nodeInfo.legalIdentities.map { address -> address.serialise() }
-            json["platformVersion"] = nodeInfo.platformVersion
-            json["serial"] = nodeInfo.serial
-            gen.writeRaw(json.toString())
-        }
-
-        private fun NetworkHostAndPort.serialise() = this.toString()
-        private fun Party.serialise() = JSONObject().put("name", this.name)
-
-        private operator fun JSONObject.set(key: String, value: Any?): JSONObject {
-            return put(key, value)
-        }
-    }
-
     private fun createOutputMapper(): ObjectMapper {
-
         return JacksonSupport.createNonRpcMapper().apply {
             // Register serializers for stateful objects from libraries that are special to the RPC system and don't
             // make sense to print out to the screen. For classes we own, annotations can be used instead.
-            val rpcModule = SimpleModule()
-            rpcModule.addSerializer(Observable::class.java, ObservableSerializer)
-            rpcModule.addSerializer(InputStream::class.java, InputStreamSerializer)
-            rpcModule.addSerializer(NodeInfo::class.java, NodeInfoSerializer)
+            val rpcModule = SimpleModule().apply {
+                addSerializer(Observable::class.java, ObservableSerializer)
+                addSerializer(InputStream::class.java, InputStreamSerializer)
+            }
             registerModule(rpcModule)
 
             disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
@@ -245,7 +220,9 @@ object InteractiveShell {
      */
     @JvmStatic
     fun runFlowByNameFragment(nameFragment: String, inputData: String, output: RenderPrintWriter, rpcOps: CordaRPCOps, ansiProgressRenderer: ANSIProgressRenderer) {
-        val matches = rpcOps.registeredFlows().filter { nameFragment in it }
+        val matches =
+            rpcOps.registeredFlows().filter { nameFragment in it }
+
         if (matches.isEmpty()) {
             output.println("No matching flow found, run 'flow list' to see your options.", Color.red)
             return
@@ -580,15 +557,5 @@ object InteractiveShell {
         }
     }
 
-    /**
-     * String value deserialized to [UUID].
-     * */
-    object UUIDDeserializer : JsonDeserializer<UUID>() {
-        override fun deserialize(p: JsonParser, ctxt: DeserializationContext): UUID {
-            //Create UUID object from string.
-            return UUID.fromString(p.text)
-        }
-    }
-
     //endregion
 }

node/src/test/kotlin/net/corda/node/shell/CustomTypeJsonParsingTests.kt

@@ -28,7 +28,6 @@ class CustomTypeJsonParsingTests {
         objectMapper = ObjectMapper()
         val simpleModule = SimpleModule()
         simpleModule.addDeserializer(UniqueIdentifier::class.java, InteractiveShell.UniqueIdentifierDeserializer)
-        simpleModule.addDeserializer(UUID::class.java, InteractiveShell.UUIDDeserializer)
         objectMapper.registerModule(simpleModule)
     }