Enabled warnings as errors (corda#3514)

jamesli20000 · Jul 4, 2018 · 244167d · 244167d
1 parent 68d0826
commit 244167d
Show file tree

Hide file tree

Showing 77 changed files with 349 additions and 441 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/build.gradle b/build.gradle
@@ -172,6 +172,7 @@ allprojects {
             jvmTarget = "1.8"
             javaParameters = true   // Useful for reflection.
             freeCompilerArgs = ['-Xjvm-default=compatibility']
+            allWarningsAsErrors = true
         }
     }
 

diff --git a/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt b/client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
@@ -3,7 +3,6 @@ package net.corda.client.jfx
 import net.corda.client.jfx.model.NodeMonitorModel
 import net.corda.client.jfx.model.ProgressTrackingEvent
 import net.corda.core.context.InvocationOrigin
-import net.corda.core.contracts.Amount
 import net.corda.core.contracts.ContractState
 import net.corda.core.crypto.isFulfilledBy
 import net.corda.core.crypto.keys
@@ -22,12 +21,9 @@ import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.getOrThrow
 import net.corda.finance.DOLLARS
-import net.corda.finance.USD
-import net.corda.finance.flows.CashExitFlow
 import net.corda.finance.flows.CashIssueFlow
 import net.corda.finance.flows.CashPaymentFlow
-import net.corda.node.services.Permissions.Companion.invokeRpc
-import net.corda.node.services.Permissions.Companion.startFlow
+import net.corda.node.services.Permissions.Companion.all
 import net.corda.testing.core.*
 import net.corda.testing.driver.DriverParameters
 import net.corda.testing.driver.driver
@@ -54,18 +50,7 @@ class NodeMonitorModelTest {
 
     private fun setup(runTest: () -> Unit) {
         driver(DriverParameters(extraCordappPackagesToScan = listOf("net.corda.finance"))) {
-            val cashUser = User("user1", "test", permissions = setOf(
-                    startFlow<CashIssueFlow>(),
-                    startFlow<CashPaymentFlow>(),
-                    startFlow<CashExitFlow>(),
-                    invokeRpc(CordaRPCOps::notaryIdentities),
-                    invokeRpc("vaultTrackBy"),
-                    invokeRpc("vaultQueryBy"),
-                    invokeRpc(CordaRPCOps::internalVerifiedTransactionsFeed),
-                    invokeRpc(CordaRPCOps::stateMachineRecordedTransactionMappingFeed),
-                    invokeRpc(CordaRPCOps::stateMachinesFeed),
-                    invokeRpc(CordaRPCOps::networkMapFeed))
-            )
+            val cashUser = User("user1", "test", permissions = setOf(all()))
             val aliceNodeHandle = startNode(providedName = ALICE_NAME, rpcUsers = listOf(cashUser)).getOrThrow()
             aliceNode = aliceNodeHandle.nodeInfo
             newNode = { nodeName -> startNode(providedName = nodeName).getOrThrow().nodeInfo }
@@ -114,11 +99,7 @@ class NodeMonitorModelTest {
 
     @Test
     fun `cash issue works end to end`() = setup {
-        rpc.startFlow(::CashIssueFlow,
-                Amount(100, USD),
-                OpaqueBytes(ByteArray(1, { 1 })),
-                notaryParty
-        )
+        rpc.startFlow(::CashIssueFlow, 100.DOLLARS, OpaqueBytes.of(1), notaryParty)
 
         vaultUpdates.expectEvents(isStrict = false) {
             sequence(

diff --git a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt
@@ -101,12 +101,12 @@ class NodeMonitorModel : AutoCloseable {
      * TODO provide an unsubscribe mechanism
      */
     fun register(nodeHostAndPort: NetworkHostAndPort, username: String, password: String) {
-
         // `retryableStateMachineUpdatesSubject` will change it's upstream subscriber in case of RPC connection failure, this `Observable` should
         // never produce an error.
         // `stateMachineUpdatesSubject` will stay firmly subscribed to `retryableStateMachineUpdatesSubject`
         retryableStateMachineUpdatesSubject.subscribe(stateMachineUpdatesSubject)
 
+        @Suppress("DEPRECATION")
         // Proxy may change during re-connect, ensure that subject wiring accurately reacts to this activity.
         proxyObservable.addListener { _, _, wrapper ->
             if (wrapper != null) {

diff --git a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt
@@ -48,7 +48,7 @@ data class PartiallyResolvedTransaction(
             return PartiallyResolvedTransaction(
                     transaction = transaction,
                     inputs = transaction.inputs.map { stateRef ->
-                        val tx = inputTransactions.get(stateRef)
+                        val tx = inputTransactions[stateRef]
                         if (tx == null) {
                             InputResolution.Unresolved(stateRef)
                         } else {
@@ -64,7 +64,7 @@ data class PartiallyResolvedTransaction(
                         val outputCount = transaction.coreTransaction.inputs.size
                         val stateRefs = (0 until outputCount).map { StateRef(transaction.id, it) }
                         stateRefs.map { stateRef ->
-                            val tx = inputTransactions.get(stateRef)
+                            val tx = inputTransactions[stateRef]
                             if (tx == null) {
                                 OutputResolution.Unresolved(stateRef)
                             } else {
@@ -84,6 +84,7 @@ class TransactionDataModel {
     private val collectedTransactions = transactions.recordInSequence().distinctBy { it.id }
     private val rpcProxy by observableValue(NodeMonitorModel::proxyObservable)
 
+    @Suppress("DEPRECATION")
     val partiallyResolvedTransactions = collectedTransactions.map {
         PartiallyResolvedTransaction.fromSignedTransaction(it,
                 it.inputs.map { stateRef ->

diff --git a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
@@ -54,14 +54,12 @@ class FlowsExecutionModeTests : NodeBasedTest(listOf("net.corda.finance.contract
 
     @Before
     fun setup() {
-
         node = startNode(ALICE_NAME, rpcUsers = listOf(rpcUser))
-        client = CordaRPCClient(node.internals.configuration.rpcOptions.address!!)
+        client = CordaRPCClient(node.internals.configuration.rpcOptions.address)
     }
 
     @Test
     fun `flows draining mode can be enabled and queried`() {
-
         asALoggerUser { rpcOps ->
             val newValue = true
             rpcOps.setFlowsDrainingModeEnabled(true)
@@ -74,7 +72,6 @@ class FlowsExecutionModeTests : NodeBasedTest(listOf("net.corda.finance.contract
 
     @Test
     fun `flows draining mode can be disabled and queried`() {
-
         asALoggerUser { rpcOps ->
             rpcOps.setFlowsDrainingModeEnabled(true)
             val newValue = false
@@ -88,7 +85,6 @@ class FlowsExecutionModeTests : NodeBasedTest(listOf("net.corda.finance.contract
 
     @Test
     fun `node starts with flows draining mode disabled`() {
-
         asALoggerUser { rpcOps ->
             val defaultStartingMode = rpcOps.isFlowsDrainingModeEnabled()
 
@@ -97,14 +93,12 @@ class FlowsExecutionModeTests : NodeBasedTest(listOf("net.corda.finance.contract
     }
 
     private fun login(username: String, password: String, externalTrace: Trace? = null, impersonatedActor: Actor? = null): CordaRPCConnection {
-
         return client.start(username, password, externalTrace, impersonatedActor)
     }
 
     private fun asALoggerUser(action: (CordaRPCOps) -> Unit) {
-
         login(rpcUser.username, rpcUser.password).use {
             action(it.proxy)
         }
     }
-}
+}
diff --git a/core/src/main/kotlin/net/corda/core/node/services/KeyManagementService.kt b/core/src/main/kotlin/net/corda/core/node/services/KeyManagementService.kt
@@ -2,11 +2,15 @@ package net.corda.core.node.services
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.DoNotImplement
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.crypto.DigitalSignature
 import net.corda.core.crypto.SignableData
 import net.corda.core.crypto.TransactionSignature
 import net.corda.core.identity.PartyAndCertificate
+import java.security.KeyPair
+import java.security.PrivateKey
 import java.security.PublicKey
+import java.security.cert.X509Certificate
 
 /**
  * The KMS is responsible for storing and using private keys to sign things. An implementation of this may, for example,

diff --git a/core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt b/core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt
@@ -122,7 +122,7 @@ object MappedSchemaValidator {
          fieldsFromOtherMappedSchema(schema) + methodsFromOtherMappedSchema(schema)
 
     /** Returns true if [javax.persistence] annotation expect [javax.persistence.Transient] is found. */
-    private inline fun hasJpaAnnotation(annotations: Array<Annotation>) =
+    private fun hasJpaAnnotation(annotations: Array<Annotation>) =
             annotations.any { annotation -> annotation.toString().startsWith("@javax.persistence.") && annotation !is javax.persistence.Transient }
 
     class SchemaCrossReferenceReport(private val schema: String, private val entity: String, private val referencedSchema: String,

diff --git a/core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt b/core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt
@@ -48,7 +48,7 @@ class WireTransaction(componentGroups: List<ComponentGroup>, val privacySalt: Pr
     @DeleteForDJVM
     constructor(componentGroups: List<ComponentGroup>) : this(componentGroups, PrivacySalt())
 
-    @Deprecated("Required only in some unit-tests and for backwards compatibility purposes.", ReplaceWith("WireTransaction(val componentGroups: List<ComponentGroup>, override val privacySalt: PrivacySalt)"), DeprecationLevel.WARNING)
+    @Deprecated("Required only for backwards compatibility purposes.", ReplaceWith("WireTransaction(val componentGroups: List<ComponentGroup>, override val privacySalt: PrivacySalt)"), DeprecationLevel.WARNING)
     @DeleteForDJVM
     constructor(inputs: List<StateRef>,
                 attachments: List<SecureHash>,

diff --git a/core/src/test/kotlin/net/corda/core/contracts/ContractsDSLTests.kt b/core/src/test/kotlin/net/corda/core/contracts/ContractsDSLTests.kt
@@ -31,7 +31,8 @@ class ContractsDSLTests {
     }
 
     @RunWith(Parameterized::class)
-    class RequireSingleCommandTests(private val testFunction: (Collection<CommandWithParties<CommandData>>) -> CommandWithParties<CommandData>, description: String) {
+    class RequireSingleCommandTests(private val testFunction: (Collection<CommandWithParties<CommandData>>) -> CommandWithParties<CommandData>,
+                                    @Suppress("UNUSED_PARAMETER") description: String) {
         companion object {
             @JvmStatic
             @Parameterized.Parameters(name = "{1}")
@@ -64,7 +65,8 @@ class ContractsDSLTests {
     }
 
     @RunWith(Parameterized::class)
-    class SelectWithSingleInputsTests(private val testFunction: (Collection<CommandWithParties<CommandData>>, PublicKey?, AbstractParty?) -> Iterable<CommandWithParties<CommandData>>, description: String) {
+    class SelectWithSingleInputsTests(private val testFunction: (Collection<CommandWithParties<CommandData>>, PublicKey?, AbstractParty?) -> Iterable<CommandWithParties<CommandData>>,
+                                      @Suppress("UNUSED_PARAMETER") description: String) {
         companion object {
             @JvmStatic
             @Parameterized.Parameters(name = "{1}")
@@ -112,7 +114,8 @@ class ContractsDSLTests {
     }
 
     @RunWith(Parameterized::class)
-    class SelectWithMultipleInputsTests(private val testFunction: (Collection<CommandWithParties<CommandData>>, Collection<PublicKey>?, Collection<Party>?) -> Iterable<CommandWithParties<CommandData>>, description: String) {
+    class SelectWithMultipleInputsTests(private val testFunction: (Collection<CommandWithParties<CommandData>>, Collection<PublicKey>?, Collection<Party>?) -> Iterable<CommandWithParties<CommandData>>,
+                                        @Suppress("UNUSED_PARAMETER") description: String) {
         companion object {
             @JvmStatic
             @Parameterized.Parameters(name = "{1}")

diff --git a/core/src/test/kotlin/net/corda/core/crypto/PartialMerkleTreeTest.kt b/core/src/test/kotlin/net/corda/core/crypto/PartialMerkleTreeTest.kt
@@ -20,6 +20,7 @@ import net.corda.testing.dsl.LedgerDSL
 import net.corda.testing.dsl.TestLedgerDSLInterpreter
 import net.corda.testing.dsl.TestTransactionDSLInterpreter
 import net.corda.testing.internal.TEST_TX_TIME
+import net.corda.testing.internal.createWireTransaction
 import net.corda.testing.internal.rigorousMock
 import net.corda.testing.node.MockServices
 import net.corda.testing.node.ledger
@@ -264,7 +265,7 @@ class PartialMerkleTreeTest {
             timeWindow: TimeWindow? = null,
             attachments: List<SecureHash> = emptyList()
     ): WireTransaction {
-        return WireTransaction(
+        return createWireTransaction(
                 inputs = testTx.inputs,
                 attachments = attachments,
                 outputs = testTx.outputs,

diff --git a/core/src/test/kotlin/net/corda/core/flows/AttachmentTests.kt b/core/src/test/kotlin/net/corda/core/flows/AttachmentTests.kt
@@ -57,7 +57,7 @@ class AttachmentTests {
         bobNode.registerInitiatedFlow(FetchAttachmentsResponse::class.java)
         // Insert an attachment into node zero's store directly.
         val id = aliceNode.database.transaction {
-            aliceNode.attachments.importAttachment(fakeAttachment().inputStream())
+            aliceNode.attachments.importAttachment(fakeAttachment().inputStream(), "test", null)
         }
 
         // Get node one to run a flow to fetch it and insert it.
@@ -110,7 +110,7 @@ class AttachmentTests {
         val attachment = fakeAttachment()
         // Insert an attachment into node zero's store directly.
         val id = aliceNode.database.transaction {
-            aliceNode.attachments.importAttachment(attachment.inputStream())
+            aliceNode.attachments.importAttachment(attachment.inputStream(), "test", null)
         }
 
         // Corrupt its store.

diff --git a/core/src/test/kotlin/net/corda/core/internal/ResolveTransactionsFlowTest.kt b/core/src/test/kotlin/net/corda/core/internal/ResolveTransactionsFlowTest.kt
@@ -146,7 +146,7 @@ class ResolveTransactionsFlowTest {
         }
         // TODO: this operation should not require an explicit transaction
         val id = megaCorpNode.transaction {
-            megaCorpNode.services.attachments.importAttachment(makeJar())
+            megaCorpNode.services.attachments.importAttachment(makeJar(), "test", null)
         }
         val stx2 = makeTransactions(withAttachment = id).second
         val p = TestFlow(stx2, megaCorp)
@@ -201,6 +201,7 @@ class ResolveTransactionsFlowTest {
         }
     }
 
+    @Suppress("unused")
     @InitiatedBy(TestFlow::class)
     private class TestResponseFlow(val otherSideSession: FlowSession) : FlowLogic<Void?>() {
         @Suspendable

diff --git a/core/src/test/kotlin/net/corda/core/internal/TopologicalSortTest.kt b/core/src/test/kotlin/net/corda/core/internal/TopologicalSortTest.kt
@@ -21,10 +21,10 @@ import rx.Observable
 import java.util.*
 
 class TopologicalSortTest {
-    class DummyTransaction(
+    class DummyTransaction constructor(
             override val id: SecureHash,
             override val inputs: List<StateRef>,
-            val numberOfOutputs: Int,
+            @Suppress("CanBeParameter") private val numberOfOutputs: Int,
             override val notary: Party
     ) : CoreTransaction() {
         override val outputs: List<TransactionState<ContractState>> = (1..numberOfOutputs).map {
@@ -78,7 +78,7 @@ class TopologicalSortTest {
         }
 
         // Swap two random items
-        transactions.combine(Generator.intRange(0, N - 1), Generator.intRange(0, N - 2)) { txs, i, j ->
+        transactions.combine(Generator.intRange(0, N - 1), Generator.intRange(0, N - 2)) { txs, i, _ ->
             val k = 0 // if (i == j) i + 1 else j
             val tmp = txs[i]
             txs[i] = txs[k]
@@ -94,7 +94,7 @@ class TopologicalSortTest {
         }
     }
 
-    fun checkTopologicallyOrdered(txs: List<SignedTransaction>) {
+    private fun checkTopologicallyOrdered(txs: List<SignedTransaction>) {
         val outputs = HashSet<StateRef>()
         for (tx in txs) {
             if (!outputs.containsAll(tx.inputs)) {

diff --git a/core/src/test/kotlin/net/corda/core/transactions/TransactionTests.kt b/core/src/test/kotlin/net/corda/core/transactions/TransactionTests.kt
@@ -8,6 +8,7 @@ import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.Party
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.core.*
+import net.corda.testing.internal.createWireTransaction
 import net.corda.testing.internal.rigorousMock
 import org.junit.Rule
 import org.junit.Test
@@ -53,7 +54,7 @@ class TransactionTests {
         val cpub = ck.public
         val c1 = CompositeKey.Builder().addKeys(apub, bpub).build(2)
         val compKey = CompositeKey.Builder().addKeys(c1, cpub).build(1)
-        val wtx = WireTransaction(
+        val wtx = createWireTransaction(
                 inputs = listOf(StateRef(SecureHash.randomSHA256(), 0)),
                 attachments = emptyList(),
                 outputs = emptyList(),
@@ -79,7 +80,7 @@ class TransactionTests {
 
     @Test
     fun `signed transaction missing signatures`() {
-        val wtx = WireTransaction(
+        val wtx = createWireTransaction(
                 inputs = listOf(StateRef(SecureHash.randomSHA256(), 0)),
                 attachments = emptyList(),
                 outputs = emptyList(),
@@ -119,8 +120,8 @@ class TransactionTests {
         }, DummyContract.PROGRAM_ID))
         val id = SecureHash.randomSHA256()
         val timeWindow: TimeWindow? = null
-        val privacySalt: PrivacySalt = PrivacySalt()
-        val transaction: LedgerTransaction = LedgerTransaction(
+        val privacySalt = PrivacySalt()
+        val transaction = LedgerTransaction(
                 inputs,
                 outputs,
                 commands,
@@ -137,7 +138,7 @@ class TransactionTests {
     @Test
     fun `transaction cannot have duplicate inputs`() {
         val stateRef = StateRef(SecureHash.randomSHA256(), 0)
-        fun buildTransaction() = WireTransaction(
+        fun buildTransaction() = createWireTransaction(
                 inputs = listOf(stateRef, stateRef),
                 attachments = emptyList(),
                 outputs = emptyList(),
@@ -160,7 +161,7 @@ class TransactionTests {
         val attachments = emptyList<Attachment>()
         val id = SecureHash.randomSHA256()
         val timeWindow: TimeWindow? = null
-        val privacySalt: PrivacySalt = PrivacySalt()
+        val privacySalt = PrivacySalt()
         fun buildTransaction() = LedgerTransaction(
                 inputs,
                 outputs,
@@ -178,7 +179,7 @@ class TransactionTests {
     @Test
     fun `transactions with identical contents must have different ids`() {
         val outputState = TransactionState(DummyContract.SingleOwnerState(0, ALICE), DummyContract.PROGRAM_ID, DUMMY_NOTARY)
-        fun buildTransaction() = WireTransaction(
+        fun buildTransaction() = createWireTransaction(
                 inputs = emptyList(),
                 attachments = emptyList(),
                 outputs = listOf(outputState),

diff --git a/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt b/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
@@ -40,6 +40,7 @@ enum class PrintOrVisualise {
     Visualise
 }
 
+@Suppress("DEPRECATION")
 fun main(args: Array<String>) {
     require(args.isNotEmpty()) { "Usage: <binary> [Print|Visualise]" }
     val printOrVisualise = PrintOrVisualise.valueOf(args[0])
@@ -99,6 +100,7 @@ fun main(args: Array<String>) {
             }
         }
         // END 5
+        Unit
     }
 }
 

diff --git a/docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt b/docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
@@ -1,4 +1,4 @@
-@file:Suppress("UNUSED_VARIABLE", "unused")
+@file:Suppress("UNUSED_VARIABLE", "unused", "DEPRECATION")
 
 package net.corda.docs
 

diff --git a/docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt b/docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package net.corda.docs
 
 import co.paralleluniverse.fibers.Suspendable