ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-29 13:44:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Address review comments.

Browse Source
This commit is contained in:
Mike Hearn 2018-07-12 16:20:25 +02:00
parent 309a5fd9ec
commit df84dd5a33
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/blobinspector/src/main/kotlin/net/corda/blobinspector/BlobInspector.kt
View File

@ -53,7 +53,7 @@ fun main(args: Array<String>) {
) )
class BlobInspector : Runnable { class BlobInspector : Runnable {
@Parameters(index = "0", paramLabel = "SOURCE", description = ["URL or file path to the blob"], converter = [SourceConverter::class]) @Parameters(index = "0", paramLabel = "SOURCE", description = ["URL or file path to the blob"], converter = [SourceConverter::class])
private var source: URL? = null var source: URL? = null
@Option(names = ["--format"], paramLabel = "type", description = ["Output format. Possible values: [YAML, JSON]"]) @Option(names = ["--format"], paramLabel = "type", description = ["Output format. Possible values: [YAML, JSON]"])
private var formatType: OutputFormatType = OutputFormatType.YAML private var formatType: OutputFormatType = OutputFormatType.YAML
@ -109,15 +109,19 @@ class BlobInspector : Runnable {
private fun parseToBinaryRelaxed(format: InputFormatType, inputBytes: ByteArray): ByteArray? { private fun parseToBinaryRelaxed(format: InputFormatType, inputBytes: ByteArray): ByteArray? {
// Try the format the user gave us first, then try the others. // Try the format the user gave us first, then try the others.
return parseToBinary(format, inputBytes) ?: parseToBinary(InputFormatType.HEX, inputBytes) //@formatter:off
?: parseToBinary(InputFormatType.BASE64, inputBytes) ?: parseToBinary(InputFormatType.BINARY, inputBytes) return parseToBinary(format, inputBytes) ?:
parseToBinary(InputFormatType.HEX, inputBytes) ?:
parseToBinary(InputFormatType.BASE64, inputBytes) ?:
parseToBinary(InputFormatType.BINARY, inputBytes)
//@formatter:on
} }
private fun parseToBinary(format: InputFormatType, inputBytes: ByteArray): ByteArray? { private fun parseToBinary(format: InputFormatType, inputBytes: ByteArray): ByteArray? {
try { try {
val bytes = when (format) { val bytes = when (format) {
InputFormatType.BINARY -> inputBytes InputFormatType.BINARY -> inputBytes
InputFormatType.HEX -> String(inputBytes).trim().toUpperCase().hexToByteArray() InputFormatType.HEX -> String(inputBytes).trim().hexToByteArray()
InputFormatType.BASE64 -> String(inputBytes).trim().base64ToByteArray() InputFormatType.BASE64 -> String(inputBytes).trim().base64ToByteArray()
} }
require(bytes.size > amqpMagic.size) { "Insufficient bytes for AMQP blob" } require(bytes.size > amqpMagic.size) { "Insufficient bytes for AMQP blob" }