ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-17 22:58:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleaned up code causing build warnings

Browse Source
This commit is contained in:
Shams Asari
2017-03-31 18:01:13 +01:00
parent 30dd29752c
commit e0c548d4fa
12 changed files with 21 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
node/src/main/kotlin/net/corda/node/driver/Driver.kt
View File

@ -1,7 +1,6 @@
@file:JvmName("Driver")
package net.corda.node.driver
import co.paralleluniverse.common.util.ProcessUtil
import com.google.common.net.HostAndPort
import com.google.common.util.concurrent.*
import com.typesafe.config.Config
@ -59,7 +58,7 @@ private val log: Logger = loggerFor<DriverDSL>()
*/
interface DriverDSLExposedInterface {
/**
* Starts a [Node] in a separate process.
* Starts a [net.corda.node.internal.Node] in a separate process.
*
* @param providedName Optional name of the node, which will be its legal name in [Party]. Defaults to something
* random. Note that this must be unique as the driver uses it as a primary key!
@ -170,7 +169,6 @@ fun <A> driver(
isDebug: Boolean = false,
driverDirectory: Path = Paths.get("build", getTimestampAsDirectoryName()),
portAllocation: PortAllocation = PortAllocation.Incremental(10000),
sshdPortAllocation: PortAllocation = PortAllocation.Incremental(20000),
debugPortAllocation: PortAllocation = PortAllocation.Incremental(5005),
systemProperties: Map<String, String> = emptyMap(),
useTestClock: Boolean = false,
@ -179,7 +177,6 @@ fun <A> driver(
) = genericDriver(
driverDsl = DriverDSL(
portAllocation = portAllocation,
sshdPortAllocation = sshdPortAllocation,
debugPortAllocation = debugPortAllocation,
systemProperties = systemProperties,
driverDirectory = driverDirectory.toAbsolutePath(),
@ -336,7 +333,6 @@ class ShutdownManager(private val executorService: ExecutorService) {
class DriverDSL(
val portAllocation: PortAllocation,
val sshdPortAllocation: PortAllocation,
val debugPortAllocation: PortAllocation,
val systemProperties: Map<String, String>,
val driverDirectory: Path,
@ -526,7 +522,6 @@ class DriverDSL(
override fun startNetworkMapService() {
val debugPort = if (isDebug) debugPortAllocation.nextPort() else null
val apiAddress = portAllocation.nextHostAndPort().toString()
val sshdAddress = sshdPortAllocation.nextHostAndPort().toString()
val baseDirectory = driverDirectory / networkMapLegalName
val config = ConfigHelper.loadConfig(
baseDirectory = baseDirectory,

4
node/src/main/kotlin/net/corda/node/services/api/AcceptsFileUpload.kt
View File

@ -1,8 +1,6 @@
package net.corda.node.services.api
import net.corda.core.crypto.SecureHash
import net.corda.core.node.services.FileUploader
import java.io.InputStream
/**
* A service that implements AcceptsFileUpload can have new binary data provided to it via an HTTP upload.
@ -16,5 +14,5 @@ interface AcceptsFileUpload: FileUploader {
/** What file extensions are acceptable for the file to be handed to upload() */
val acceptableFileExtensions: List<String>
override fun accepts(prefix: String) = prefix == dataTypePrefix
override fun accepts(type: String) = type == dataTypePrefix
}

1
node/src/main/kotlin/net/corda/node/services/persistence/StorageServiceImpl.kt
View File

@ -10,6 +10,7 @@ open class StorageServiceImpl(override val attachments: AttachmentStorage,
lateinit override var uploaders: List<FileUploader>
fun initUploaders(uploadersList: List<FileUploader>) {
@Suppress("DEPRECATION")
uploaders = uploadersList
}
}