diff --git a/client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/ValidateClasspathTest.kt b/client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/ValidateClasspathTest.kt index ecc534ca8a..f79e97641a 100644 --- a/client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/ValidateClasspathTest.kt +++ b/client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/ValidateClasspathTest.kt @@ -1,6 +1,6 @@ package net.corda.kotlin.rpc -import net.corda.core.div +import net.corda.core.internal.div import org.junit.Test import java.io.File import java.nio.file.Path diff --git a/core/src/main/java/net/corda/core/internal/package-info.java b/core/src/main/java/net/corda/core/internal/package-info.java new file mode 100644 index 0000000000..aa06d1bace --- /dev/null +++ b/core/src/main/java/net/corda/core/internal/package-info.java @@ -0,0 +1,4 @@ +/** + * WARNING: This is an internal package and not part of the public API. Do not use anything found here or in any sub-package. + */ +package net.corda.core.internal; \ No newline at end of file diff --git a/core/src/main/kotlin/net/corda/core/Utils.kt b/core/src/main/kotlin/net/corda/core/Utils.kt index a169623d80..bf38a24d07 100644 --- a/core/src/main/kotlin/net/corda/core/Utils.kt +++ b/core/src/main/kotlin/net/corda/core/Utils.kt @@ -9,6 +9,9 @@ import com.google.common.util.concurrent.* import net.corda.core.crypto.SecureHash import net.corda.core.crypto.sha256 import net.corda.core.flows.FlowException +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div +import net.corda.core.internal.write import net.corda.core.serialization.CordaSerializable import org.slf4j.Logger import rx.Observable @@ -17,10 +20,8 @@ import rx.subjects.PublishSubject import rx.subjects.UnicastSubject import java.io.* import java.math.BigDecimal -import java.nio.charset.Charset -import java.nio.charset.StandardCharsets.UTF_8 -import java.nio.file.* -import java.nio.file.attribute.FileAttribute +import java.nio.file.Files +import java.nio.file.Path import java.time.Duration import java.time.temporal.Temporal import java.util.concurrent.CompletableFuture @@ -28,7 +29,6 @@ import java.util.concurrent.ExecutionException import java.util.concurrent.Future import java.util.concurrent.TimeUnit import java.util.concurrent.locks.ReentrantLock -import java.util.stream.Stream import java.util.zip.Deflater import java.util.zip.ZipEntry import java.util.zip.ZipInputStream @@ -107,40 +107,6 @@ fun <A> ListenableFuture<out A>.toObservable(): Observable<A> { } } -/** Allows you to write code like: Paths.get("someDir") / "subdir" / "filename" but using the Paths API to avoid platform separator problems. */ -operator fun Path.div(other: String): Path = resolve(other) -operator fun String.div(other: String): Path = Paths.get(this) / other - -fun Path.createDirectory(vararg attrs: FileAttribute<*>): Path = Files.createDirectory(this, *attrs) -fun Path.createDirectories(vararg attrs: FileAttribute<*>): Path = Files.createDirectories(this, *attrs) -fun Path.exists(vararg options: LinkOption): Boolean = Files.exists(this, *options) -fun Path.copyToDirectory(targetDir: Path, vararg options: CopyOption): Path { - require(targetDir.isDirectory()) { "$targetDir is not a directory" } - val targetFile = targetDir.resolve(fileName) - Files.copy(this, targetFile, *options) - return targetFile -} -fun Path.moveTo(target: Path, vararg options: CopyOption): Path = Files.move(this, target, *options) -fun Path.isRegularFile(vararg options: LinkOption): Boolean = Files.isRegularFile(this, *options) -fun Path.isDirectory(vararg options: LinkOption): Boolean = Files.isDirectory(this, *options) -val Path.size: Long get() = Files.size(this) -inline fun <R> Path.list(block: (Stream<Path>) -> R): R = Files.list(this).use(block) -fun Path.deleteIfExists(): Boolean = Files.deleteIfExists(this) -fun Path.readAll(): ByteArray = Files.readAllBytes(this) -inline fun <R> Path.read(vararg options: OpenOption, block: (InputStream) -> R): R = Files.newInputStream(this, *options).use(block) -inline fun Path.write(createDirs: Boolean = false, vararg options: OpenOption = emptyArray(), block: (OutputStream) -> Unit) { - if (createDirs) { - normalize().parent?.createDirectories() - } - Files.newOutputStream(this, *options).use(block) -} - -inline fun <R> Path.readLines(charset: Charset = UTF_8, block: (Stream<String>) -> R): R = Files.lines(this, charset).use(block) -fun Path.readAllLines(charset: Charset = UTF_8): List<String> = Files.readAllLines(this, charset) -fun Path.writeLines(lines: Iterable<CharSequence>, charset: Charset = UTF_8, vararg options: OpenOption): Path = Files.write(this, lines, charset, *options) - -fun InputStream.copyTo(target: Path, vararg options: CopyOption): Long = Files.copy(this, target, *options) - // Simple infix function to add back null safety that the JDK lacks: timeA until timeB infix fun Temporal.until(endExclusive: Temporal): Duration = Duration.between(this, endExclusive) diff --git a/core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt b/core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt new file mode 100644 index 0000000000..45c6629d62 --- /dev/null +++ b/core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt @@ -0,0 +1,46 @@ +package net.corda.core.internal + +import java.io.InputStream +import java.io.OutputStream +import java.nio.charset.Charset +import java.nio.charset.StandardCharsets.UTF_8 +import java.nio.file.* +import java.nio.file.attribute.FileAttribute +import java.util.stream.Stream + +/** + * Allows you to write code like: Paths.get("someDir") / "subdir" / "filename" but using the Paths API to avoid platform + * separator problems. + */ +operator fun Path.div(other: String): Path = resolve(other) +operator fun String.div(other: String): Path = Paths.get(this) / other + +fun Path.createDirectory(vararg attrs: FileAttribute<*>): Path = Files.createDirectory(this, *attrs) +fun Path.createDirectories(vararg attrs: FileAttribute<*>): Path = Files.createDirectories(this, *attrs) +fun Path.exists(vararg options: LinkOption): Boolean = Files.exists(this, *options) +fun Path.copyToDirectory(targetDir: Path, vararg options: CopyOption): Path { + require(targetDir.isDirectory()) { "$targetDir is not a directory" } + val targetFile = targetDir.resolve(fileName) + Files.copy(this, targetFile, *options) + return targetFile +} +fun Path.moveTo(target: Path, vararg options: CopyOption): Path = Files.move(this, target, *options) +fun Path.isRegularFile(vararg options: LinkOption): Boolean = Files.isRegularFile(this, *options) +fun Path.isDirectory(vararg options: LinkOption): Boolean = Files.isDirectory(this, *options) +inline val Path.size: Long get() = Files.size(this) +inline fun <R> Path.list(block: (Stream<Path>) -> R): R = Files.list(this).use(block) +fun Path.deleteIfExists(): Boolean = Files.deleteIfExists(this) +fun Path.readAll(): ByteArray = Files.readAllBytes(this) +inline fun <R> Path.read(vararg options: OpenOption, block: (InputStream) -> R): R = Files.newInputStream(this, *options).use(block) +inline fun Path.write(createDirs: Boolean = false, vararg options: OpenOption = emptyArray(), block: (OutputStream) -> Unit) { + if (createDirs) { + normalize().parent?.createDirectories() + } + Files.newOutputStream(this, *options).use(block) +} + +inline fun <R> Path.readLines(charset: Charset = UTF_8, block: (Stream<String>) -> R): R = Files.lines(this, charset).use(block) +fun Path.readAllLines(charset: Charset = UTF_8): List<String> = Files.readAllLines(this, charset) +fun Path.writeLines(lines: Iterable<CharSequence>, charset: Charset = UTF_8, vararg options: OpenOption): Path = Files.write(this, lines, charset, *options) + +fun InputStream.copyTo(target: Path, vararg options: CopyOption): Long = Files.copy(this, target, *options) \ No newline at end of file diff --git a/core/src/test/kotlin/net/corda/core/crypto/CompositeKeyTests.kt b/core/src/test/kotlin/net/corda/core/crypto/CompositeKeyTests.kt index c0816b10ed..d0d773951c 100644 --- a/core/src/test/kotlin/net/corda/core/crypto/CompositeKeyTests.kt +++ b/core/src/test/kotlin/net/corda/core/crypto/CompositeKeyTests.kt @@ -3,7 +3,7 @@ package net.corda.core.crypto import net.corda.core.crypto.composite.CompositeKey import net.corda.core.crypto.composite.CompositeSignature import net.corda.core.crypto.composite.CompositeSignaturesWithKeys -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.serialization.serialize import net.corda.core.utilities.OpaqueBytes import net.corda.node.utilities.loadKeyStore diff --git a/core/src/test/kotlin/net/corda/core/crypto/X509UtilitiesTest.kt b/core/src/test/kotlin/net/corda/core/crypto/X509UtilitiesTest.kt index e2247edb7d..1b6e651035 100644 --- a/core/src/test/kotlin/net/corda/core/crypto/X509UtilitiesTest.kt +++ b/core/src/test/kotlin/net/corda/core/crypto/X509UtilitiesTest.kt @@ -4,7 +4,7 @@ import net.corda.core.crypto.Crypto.EDDSA_ED25519_SHA512 import net.corda.core.crypto.Crypto.generateKeyPair import net.corda.core.crypto.X509Utilities.DEFAULT_TLS_SIGNATURE_SCHEME import net.corda.core.crypto.X509Utilities.createSelfSignedCACertificate -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.toTypedArray import net.corda.node.services.config.createKeystoreForCordaNode import net.corda.node.utilities.* diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/ArtemisMessagingComponent.kt b/node-api/src/main/kotlin/net/corda/nodeapi/ArtemisMessagingComponent.kt index a37a841f83..f1ad6582a1 100644 --- a/node-api/src/main/kotlin/net/corda/nodeapi/ArtemisMessagingComponent.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/ArtemisMessagingComponent.kt @@ -6,7 +6,7 @@ import net.corda.core.messaging.MessageRecipients import net.corda.core.messaging.SingleMessageRecipient import net.corda.core.node.NodeInfo import net.corda.core.node.services.ServiceType -import net.corda.core.read +import net.corda.core.internal.read import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.SingletonSerializeAsToken import net.corda.core.utilities.NetworkHostAndPort diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt b/node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt index 13a70eb517..6fb82e508f 100644 --- a/node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/config/SSLConfiguration.kt @@ -1,6 +1,6 @@ package net.corda.nodeapi.config -import net.corda.core.div +import net.corda.core.internal.div import java.nio.file.Path interface SSLConfiguration { diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/config/ConfigParsingTest.kt b/node-api/src/test/kotlin/net/corda/nodeapi/config/ConfigParsingTest.kt index a3abc82492..1d7b061fad 100644 --- a/node-api/src/test/kotlin/net/corda/nodeapi/config/ConfigParsingTest.kt +++ b/node-api/src/test/kotlin/net/corda/nodeapi/config/ConfigParsingTest.kt @@ -4,7 +4,7 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory.empty import com.typesafe.config.ConfigRenderOptions.defaults import com.typesafe.config.ConfigValueFactory -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.utilities.NetworkHostAndPort import net.corda.testing.getTestX509Name import org.assertj.core.api.Assertions.assertThat diff --git a/node/src/integration-test/kotlin/net/corda/node/BootTests.kt b/node/src/integration-test/kotlin/net/corda/node/BootTests.kt index b5366a7ace..3048c19417 100644 --- a/node/src/integration-test/kotlin/net/corda/node/BootTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/BootTests.kt @@ -1,7 +1,7 @@ package net.corda.node import co.paralleluniverse.fibers.Suspendable -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.flows.FlowLogic import net.corda.core.flows.StartableByRPC import net.corda.core.getOrThrow diff --git a/node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt b/node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt index f361a57a2e..5889c4d269 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt @@ -6,7 +6,7 @@ import net.corda.core.contracts.StateRef import net.corda.core.contracts.TransactionType import net.corda.core.crypto.SecureHash import net.corda.core.crypto.composite.CompositeKey -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.flows.NotaryError import net.corda.core.flows.NotaryException import net.corda.core.flows.NotaryFlow diff --git a/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityAsNodeTest.kt b/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityAsNodeTest.kt index a5abf5f336..6d3dbd452d 100644 --- a/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityAsNodeTest.kt +++ b/node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityAsNodeTest.kt @@ -1,11 +1,11 @@ package net.corda.services.messaging -import net.corda.core.copyTo -import net.corda.core.createDirectories +import net.corda.core.internal.copyTo +import net.corda.core.internal.createDirectories import net.corda.core.crypto.CertificateType import net.corda.core.crypto.Crypto import net.corda.core.crypto.X509Utilities -import net.corda.core.exists +import net.corda.core.internal.exists import net.corda.node.utilities.* import net.corda.nodeapi.ArtemisMessagingComponent.Companion.NODE_USER import net.corda.nodeapi.ArtemisMessagingComponent.Companion.PEER_USER diff --git a/node/src/main/kotlin/net/corda/node/ArgsParser.kt b/node/src/main/kotlin/net/corda/node/ArgsParser.kt index 6168e4b99b..1527beec44 100644 --- a/node/src/main/kotlin/net/corda/node/ArgsParser.kt +++ b/node/src/main/kotlin/net/corda/node/ArgsParser.kt @@ -2,7 +2,7 @@ package net.corda.node import joptsimple.OptionParser import joptsimple.util.EnumConverter -import net.corda.core.div +import net.corda.core.internal.div import net.corda.node.services.config.ConfigHelper import net.corda.node.services.config.FullNodeConfiguration import net.corda.nodeapi.config.parseAs diff --git a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt index 2420a736bd..3557eff7e7 100644 --- a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt +++ b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt @@ -14,6 +14,7 @@ import net.corda.core.crypto.composite.CompositeKey import net.corda.core.flows.* import net.corda.core.identity.Party import net.corda.core.identity.PartyAndCertificate +import net.corda.core.internal.* import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.RPCOps import net.corda.core.messaging.SingleMessageRecipient diff --git a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt index f819f8fa31..33bdffcadc 100644 --- a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt +++ b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt @@ -6,6 +6,8 @@ import joptsimple.OptionException import net.corda.core.* import net.corda.core.crypto.commonName import net.corda.core.crypto.orgName +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div import net.corda.node.VersionInfo import net.corda.core.node.services.ServiceInfo import net.corda.core.utilities.Emoji diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt index 882de35155..b1217548d0 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt @@ -4,11 +4,11 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigParseOptions import com.typesafe.config.ConfigRenderOptions -import net.corda.core.copyTo -import net.corda.core.createDirectories +import net.corda.core.internal.copyTo +import net.corda.core.internal.createDirectories import net.corda.core.crypto.* -import net.corda.core.div -import net.corda.core.exists +import net.corda.core.internal.div +import net.corda.core.internal.exists import net.corda.core.utilities.loggerFor import net.corda.node.utilities.* import net.corda.nodeapi.config.SSLConfiguration diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt index c300cfd69a..e84db12439 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt @@ -7,6 +7,7 @@ import net.corda.core.* import net.corda.core.crypto.* import net.corda.core.crypto.X509Utilities.CORDA_CLIENT_TLS import net.corda.core.crypto.X509Utilities.CORDA_ROOT_CA +import net.corda.core.internal.div import net.corda.core.node.NodeInfo import net.corda.core.node.services.NetworkMapCache import net.corda.core.node.services.NetworkMapCache.MapChange diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/NodeAttachmentService.kt b/node/src/main/kotlin/net/corda/node/services/persistence/NodeAttachmentService.kt index bbb4ffc340..9021f45af6 100644 --- a/node/src/main/kotlin/net/corda/node/services/persistence/NodeAttachmentService.kt +++ b/node/src/main/kotlin/net/corda/node/services/persistence/NodeAttachmentService.kt @@ -9,7 +9,7 @@ import com.google.common.io.CountingInputStream import net.corda.core.contracts.AbstractAttachment import net.corda.core.contracts.Attachment import net.corda.core.crypto.SecureHash -import net.corda.core.isDirectory +import net.corda.core.internal.isDirectory import net.corda.core.node.services.AttachmentStorage import net.corda.core.serialization.* import net.corda.core.utilities.loggerFor diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/BFTSMaRtConfig.kt b/node/src/main/kotlin/net/corda/node/services/transactions/BFTSMaRtConfig.kt index 72c0212eb2..28f6375c60 100644 --- a/node/src/main/kotlin/net/corda/node/services/transactions/BFTSMaRtConfig.kt +++ b/node/src/main/kotlin/net/corda/node/services/transactions/BFTSMaRtConfig.kt @@ -1,6 +1,6 @@ package net.corda.node.services.transactions -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.debug import net.corda.core.utilities.loggerFor diff --git a/node/src/main/kotlin/net/corda/node/shell/InteractiveShell.kt b/node/src/main/kotlin/net/corda/node/shell/InteractiveShell.kt index 553890b946..b9ed79ce82 100644 --- a/node/src/main/kotlin/net/corda/node/shell/InteractiveShell.kt +++ b/node/src/main/kotlin/net/corda/node/shell/InteractiveShell.kt @@ -13,6 +13,9 @@ import net.corda.core.* import net.corda.core.flows.FlowInitiator import net.corda.core.flows.FlowLogic import net.corda.core.internal.FlowStateMachine +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div +import net.corda.core.internal.write import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.StateMachineUpdate import net.corda.core.utilities.Emoji diff --git a/node/src/main/kotlin/net/corda/node/utilities/KeyStoreUtilities.kt b/node/src/main/kotlin/net/corda/node/utilities/KeyStoreUtilities.kt index f4a26d5b28..161a4f8142 100644 --- a/node/src/main/kotlin/net/corda/node/utilities/KeyStoreUtilities.kt +++ b/node/src/main/kotlin/net/corda/node/utilities/KeyStoreUtilities.kt @@ -3,9 +3,9 @@ package net.corda.node.utilities import net.corda.core.crypto.CertificateAndKeyPair import net.corda.core.crypto.Crypto import net.corda.core.crypto.cert -import net.corda.core.exists -import net.corda.core.read -import net.corda.core.write +import net.corda.core.internal.exists +import net.corda.core.internal.read +import net.corda.core.internal.write import org.bouncycastle.cert.X509CertificateHolder import org.bouncycastle.cert.path.CertPath import java.io.IOException diff --git a/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt b/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt index b362153d6d..f9942475fc 100644 --- a/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt +++ b/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt @@ -8,6 +8,7 @@ import net.corda.core.crypto.X509Utilities.CORDA_CLIENT_CA import net.corda.core.crypto.X509Utilities.CORDA_CLIENT_TLS import net.corda.core.crypto.X509Utilities.CORDA_ROOT_CA import net.corda.core.crypto.cert +import net.corda.core.internal.* import net.corda.node.services.config.NodeConfiguration import net.corda.node.utilities.* import org.bouncycastle.cert.path.CertPath diff --git a/node/src/smoke-test/kotlin/net/corda/node/CordappScanningNodeProcessTest.kt b/node/src/smoke-test/kotlin/net/corda/node/CordappScanningNodeProcessTest.kt index 87b8faad10..6ddb4dc4e1 100644 --- a/node/src/smoke-test/kotlin/net/corda/node/CordappScanningNodeProcessTest.kt +++ b/node/src/smoke-test/kotlin/net/corda/node/CordappScanningNodeProcessTest.kt @@ -1,8 +1,8 @@ package net.corda.node -import net.corda.core.copyToDirectory -import net.corda.core.createDirectories -import net.corda.core.div +import net.corda.core.internal.copyToDirectory +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div import net.corda.nodeapi.User import net.corda.smoketesting.NodeConfig import net.corda.smoketesting.NodeProcess diff --git a/node/src/test/kotlin/net/corda/node/ArgsParserTest.kt b/node/src/test/kotlin/net/corda/node/ArgsParserTest.kt index 2316f31e92..94b09c11c5 100644 --- a/node/src/test/kotlin/net/corda/node/ArgsParserTest.kt +++ b/node/src/test/kotlin/net/corda/node/ArgsParserTest.kt @@ -1,7 +1,7 @@ package net.corda.node import joptsimple.OptionException -import net.corda.core.div +import net.corda.core.internal.div import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.junit.Test diff --git a/node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt b/node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt index 5c33a9707a..c24f89cd2d 100644 --- a/node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt +++ b/node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt @@ -5,11 +5,11 @@ import com.google.common.jimfs.Configuration import com.google.common.jimfs.Jimfs import net.corda.core.crypto.SecureHash import net.corda.core.crypto.sha256 -import net.corda.core.read -import net.corda.core.readAll +import net.corda.core.internal.read +import net.corda.core.internal.readAll import net.corda.testing.LogHelper -import net.corda.core.write -import net.corda.core.writeLines +import net.corda.core.internal.write +import net.corda.core.internal.writeLines import net.corda.node.services.database.RequeryConfiguration import net.corda.node.services.persistence.schemas.requery.AttachmentEntity import net.corda.node.services.transactions.PersistentUniquenessProvider diff --git a/node/src/test/kotlin/net/corda/node/services/transactions/PathManagerTests.kt b/node/src/test/kotlin/net/corda/node/services/transactions/PathManagerTests.kt index baec774fa0..834126f17d 100644 --- a/node/src/test/kotlin/net/corda/node/services/transactions/PathManagerTests.kt +++ b/node/src/test/kotlin/net/corda/node/services/transactions/PathManagerTests.kt @@ -1,6 +1,6 @@ package net.corda.node.services.transactions -import net.corda.core.exists +import net.corda.core.internal.exists import org.junit.Test import java.nio.file.Files import kotlin.test.assertFailsWith diff --git a/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkisRegistrationHelperTest.kt b/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkisRegistrationHelperTest.kt index c08e5bc72b..95580f6d82 100644 --- a/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkisRegistrationHelperTest.kt +++ b/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkisRegistrationHelperTest.kt @@ -4,7 +4,7 @@ import com.nhaarman.mockito_kotlin.any import com.nhaarman.mockito_kotlin.eq import com.nhaarman.mockito_kotlin.mock import net.corda.core.crypto.* -import net.corda.core.exists +import net.corda.core.internal.exists import net.corda.core.toTypedArray import net.corda.node.utilities.loadKeyStore import net.corda.testing.ALICE diff --git a/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/Main.kt b/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/Main.kt index 4528c419c0..bd586c7542 100644 --- a/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/Main.kt +++ b/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/Main.kt @@ -1,6 +1,6 @@ package net.corda.attachmentdemo -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.node.services.ServiceInfo import net.corda.testing.DUMMY_BANK_A import net.corda.testing.DUMMY_BANK_B diff --git a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt index 3f6af7fc9f..e9d72c01e6 100644 --- a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt +++ b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt @@ -1,6 +1,6 @@ package net.corda.notarydemo -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.node.services.ServiceInfo import net.corda.testing.ALICE import net.corda.testing.BOB diff --git a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt index 10a94ea6a4..f0f5279def 100644 --- a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt +++ b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt @@ -1,7 +1,7 @@ package net.corda.notarydemo import net.corda.core.crypto.appendToCommonName -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.node.services.ServiceInfo import net.corda.testing.ALICE import net.corda.testing.BOB diff --git a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt index bdd1c21093..567bfe03f5 100644 --- a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt +++ b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt @@ -1,6 +1,6 @@ package net.corda.notarydemo -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.node.services.ServiceInfo import net.corda.testing.ALICE import net.corda.testing.BOB diff --git a/samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/analytics/example/OGSwapPricingCcpExample.kt b/samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/analytics/example/OGSwapPricingCcpExample.kt index 3966488829..4c4821d4f5 100644 --- a/samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/analytics/example/OGSwapPricingCcpExample.kt +++ b/samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/analytics/example/OGSwapPricingCcpExample.kt @@ -32,8 +32,8 @@ import com.opengamma.strata.product.common.BuySell import com.opengamma.strata.product.swap.type.FixedIborSwapConventions import com.opengamma.strata.report.ReportCalculationResults import com.opengamma.strata.report.trade.TradeReport -import net.corda.core.div -import net.corda.core.exists +import net.corda.core.internal.div +import net.corda.core.internal.exists import java.nio.file.Path import java.nio.file.Paths import java.time.LocalDate diff --git a/samples/trader-demo/src/test/kotlin/net/corda/traderdemo/Main.kt b/samples/trader-demo/src/test/kotlin/net/corda/traderdemo/Main.kt index 544055d907..d376d21ca8 100644 --- a/samples/trader-demo/src/test/kotlin/net/corda/traderdemo/Main.kt +++ b/samples/trader-demo/src/test/kotlin/net/corda/traderdemo/Main.kt @@ -1,6 +1,6 @@ package net.corda.traderdemo -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.node.services.ServiceInfo import net.corda.testing.DUMMY_BANK_A import net.corda.testing.DUMMY_BANK_B diff --git a/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt b/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt index f7a56f2be9..6ab3de90d7 100644 --- a/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt +++ b/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt @@ -2,8 +2,8 @@ package net.corda.smoketesting import net.corda.client.rpc.CordaRPCClient import net.corda.client.rpc.CordaRPCConnection -import net.corda.core.createDirectories -import net.corda.core.div +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.loggerFor import java.nio.file.Path diff --git a/test-utils/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt b/test-utils/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt index a6ba60fc47..8beae0b433 100644 --- a/test-utils/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt +++ b/test-utils/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt @@ -1,11 +1,11 @@ package net.corda.testing.driver import com.google.common.util.concurrent.ListenableFuture -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.getOrThrow -import net.corda.core.list +import net.corda.core.internal.list import net.corda.core.node.services.ServiceInfo -import net.corda.core.readLines +import net.corda.core.internal.readLines import net.corda.testing.DUMMY_BANK_A import net.corda.testing.DUMMY_NOTARY import net.corda.testing.DUMMY_REGULATOR diff --git a/test-utils/src/main/kotlin/net/corda/testing/ProjectStructure.kt b/test-utils/src/main/kotlin/net/corda/testing/ProjectStructure.kt index 3e866fdf4e..1809d4dc16 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/ProjectStructure.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/ProjectStructure.kt @@ -1,7 +1,7 @@ package net.corda.testing -import net.corda.core.div -import net.corda.core.isDirectory +import net.corda.core.internal.div +import net.corda.core.internal.isDirectory import java.nio.file.Path import java.nio.file.Paths diff --git a/test-utils/src/main/kotlin/net/corda/testing/RPCDriver.kt b/test-utils/src/main/kotlin/net/corda/testing/RPCDriver.kt index af6844273b..ff78e3deeb 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/RPCDriver.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/RPCDriver.kt @@ -7,7 +7,7 @@ import net.corda.client.mock.int import net.corda.client.mock.string import net.corda.client.rpc.internal.RPCClient import net.corda.client.rpc.internal.RPCClientConfiguration -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.map import net.corda.core.messaging.RPCOps import net.corda.core.utilities.NetworkHostAndPort diff --git a/test-utils/src/main/kotlin/net/corda/testing/driver/Driver.kt b/test-utils/src/main/kotlin/net/corda/testing/driver/Driver.kt index 809f3fd4b6..bf7d4c5a94 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/driver/Driver.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/driver/Driver.kt @@ -15,6 +15,7 @@ import net.corda.core.crypto.X509Utilities import net.corda.core.crypto.appendToCommonName import net.corda.core.crypto.commonName import net.corda.core.identity.Party +import net.corda.core.internal.div import net.corda.core.messaging.CordaRPCOps import net.corda.core.node.NodeInfo import net.corda.core.node.services.ServiceInfo diff --git a/test-utils/src/main/kotlin/net/corda/testing/driver/ProcessUtilities.kt b/test-utils/src/main/kotlin/net/corda/testing/driver/ProcessUtilities.kt index 7ac9eedf94..c020d830a1 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/driver/ProcessUtilities.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/driver/ProcessUtilities.kt @@ -1,7 +1,7 @@ package net.corda.testing.driver -import net.corda.core.div -import net.corda.core.exists +import net.corda.core.internal.div +import net.corda.core.internal.exists import java.io.File.pathSeparator import java.nio.file.Path diff --git a/test-utils/src/main/kotlin/net/corda/testing/node/MockNode.kt b/test-utils/src/main/kotlin/net/corda/testing/node/MockNode.kt index aaf1abb4ad..e511175760 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/node/MockNode.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/node/MockNode.kt @@ -11,6 +11,9 @@ import net.corda.core.crypto.cert import net.corda.core.crypto.entropyToKeyPair import net.corda.core.crypto.random63BitValue import net.corda.core.identity.PartyAndCertificate +import net.corda.core.internal.createDirectories +import net.corda.core.internal.createDirectory +import net.corda.core.internal.div import net.corda.core.messaging.MessageRecipients import net.corda.core.messaging.RPCOps import net.corda.core.messaging.SingleMessageRecipient diff --git a/test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt b/test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt index 81b11bd7fc..7aa63a557f 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt @@ -7,6 +7,8 @@ import net.corda.core.* import net.corda.core.crypto.X509Utilities import net.corda.core.crypto.appendToCommonName import net.corda.core.crypto.commonName +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceType import net.corda.core.utilities.WHITESPACE diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/explorer/Explorer.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/explorer/Explorer.kt index 52f76905be..3bf445b827 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/explorer/Explorer.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/explorer/Explorer.kt @@ -1,8 +1,8 @@ package net.corda.demobench.explorer -import net.corda.core.createDirectories -import net.corda.core.div -import net.corda.core.list +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div +import net.corda.core.internal.list import net.corda.core.utilities.loggerFor import net.corda.demobench.model.JVMConfig import net.corda.demobench.model.NodeConfig diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt index 0049c9e194..cf9822f969 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt @@ -15,14 +15,14 @@ import javafx.scene.layout.Priority import javafx.stage.FileChooser import javafx.util.StringConverter import net.corda.core.crypto.commonName -import net.corda.core.div -import net.corda.core.exists +import net.corda.core.internal.div +import net.corda.core.internal.exists import net.corda.core.node.CityDatabase import net.corda.core.node.WorldMapLocation -import net.corda.core.readAllLines +import net.corda.core.internal.readAllLines import net.corda.core.utilities.normaliseLegalName import net.corda.core.utilities.validateLegalName -import net.corda.core.writeLines +import net.corda.core.internal.writeLines import net.corda.demobench.model.* import net.corda.demobench.ui.CloseableTab import org.controlsfx.control.CheckListView diff --git a/tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt b/tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt index 904a90f717..6fee64384a 100644 --- a/tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt +++ b/tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigValueFactory -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.utilities.NetworkHostAndPort import net.corda.testing.DUMMY_NOTARY import net.corda.node.internal.NetworkMapInfo diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/model/SettingsModel.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/model/SettingsModel.kt index 2ee2e62814..2e85b434d8 100644 --- a/tools/explorer/src/main/kotlin/net/corda/explorer/model/SettingsModel.kt +++ b/tools/explorer/src/main/kotlin/net/corda/explorer/model/SettingsModel.kt @@ -5,9 +5,9 @@ import javafx.beans.Observable import javafx.beans.property.ObjectProperty import javafx.beans.property.SimpleObjectProperty import net.corda.core.contracts.currency -import net.corda.core.createDirectories -import net.corda.core.div -import net.corda.core.exists +import net.corda.core.internal.createDirectories +import net.corda.core.internal.div +import net.corda.core.internal.exists import tornadofx.* import java.nio.file.Files import java.nio.file.Path diff --git a/tools/explorer/src/test/kotlin/net/corda/explorer/model/SettingsModelTest.kt b/tools/explorer/src/test/kotlin/net/corda/explorer/model/SettingsModelTest.kt index 5d78027bf0..d09cde66cb 100644 --- a/tools/explorer/src/test/kotlin/net/corda/explorer/model/SettingsModelTest.kt +++ b/tools/explorer/src/test/kotlin/net/corda/explorer/model/SettingsModelTest.kt @@ -1,6 +1,6 @@ package net.corda.explorer.model -import net.corda.core.div +import net.corda.core.internal.div import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder diff --git a/verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt b/verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt index 66315907aa..870500cb15 100644 --- a/verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt +++ b/verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt @@ -8,7 +8,7 @@ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import net.corda.core.crypto.X509Utilities import net.corda.core.crypto.commonName -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.map import net.corda.core.crypto.random63BitValue import net.corda.core.transactions.LedgerTransaction diff --git a/verifier/src/main/kotlin/net/corda/verifier/Verifier.kt b/verifier/src/main/kotlin/net/corda/verifier/Verifier.kt index b8df7f891b..f5c54a013a 100644 --- a/verifier/src/main/kotlin/net/corda/verifier/Verifier.kt +++ b/verifier/src/main/kotlin/net/corda/verifier/Verifier.kt @@ -3,7 +3,7 @@ package net.corda.verifier import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigParseOptions -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.debug import net.corda.core.utilities.loggerFor diff --git a/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt b/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt index 539b812a44..d78f9087a7 100644 --- a/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt +++ b/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt @@ -6,7 +6,7 @@ import com.typesafe.config.ConfigParseOptions import com.typesafe.config.ConfigRenderOptions import joptsimple.OptionParser import joptsimple.util.EnumConverter -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.utilities.loggerFor import org.slf4j.event.Level import java.io.PrintStream diff --git a/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt b/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt index 4f7a072466..99420e2abb 100644 --- a/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt +++ b/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt @@ -3,7 +3,7 @@ package net.corda.webserver import com.typesafe.config.ConfigException -import net.corda.core.div +import net.corda.core.internal.div import net.corda.core.rootCause import net.corda.webserver.internal.NodeWebServer import org.slf4j.LoggerFactory