From 070f0c040e7825d3a435be00157daf199a2d8717 Mon Sep 17 00:00:00 2001 From: Shams Asari Date: Tue, 18 Jul 2017 13:14:11 +0100 Subject: [PATCH] Moved a bunch of stuff which shouldn't be public out of core.utilities and into core.internal --- .../corda/client/rpc/internal/RPCClientProxyHandler.kt | 3 +++ .../kotlin/net/corda/client/rpc/RPCPerformanceTests.kt | 2 +- core/src/main/kotlin/net/corda/core/Utils.kt | 6 ------ .../net/corda/core/{utilities => internal}/Emoji.kt | 9 ++++++--- .../net/corda/core/{utilities => internal}/LazyPool.kt | 3 +-- .../corda/core/{utilities => internal}/LazyStickyPool.kt | 2 +- .../net/corda/core/{utilities => internal}/LifeCycle.kt | 2 +- .../src/main/kotlin/net/corda/core/serialization/Kryo.kt | 2 +- .../net/corda/core/transactions/WireTransaction.kt | 2 +- .../net/corda/core/flows/ContractUpgradeFlowTest.kt | 2 +- .../main/kotlin/net/corda/contracts/CommercialPaper.kt | 2 +- .../kotlin/net/corda/contracts/CommercialPaperLegacy.kt | 2 +- .../src/main/kotlin/net/corda/contracts/asset/Cash.kt | 2 +- .../main/kotlin/net/corda/contracts/asset/Obligation.kt | 2 +- .../kotlin/net/corda/contracts/DummyFungibleContract.kt | 2 +- .../kotlin/net/corda/node/NodePerformanceTests.kt | 2 +- .../main/kotlin/net/corda/node/internal/NodeStartup.kt | 2 +- .../net/corda/node/services/messaging/RPCServer.kt | 2 ++ .../main/kotlin/net/corda/node/shell/InteractiveShell.kt | 2 +- .../net/corda/node/utilities/ANSIProgressRenderer.kt | 2 +- .../kotlin/net/corda/attachmentdemo/AttachmentDemo.kt | 2 +- .../kotlin/net/corda/traderdemo/TraderDemoClientApi.kt | 2 +- .../main/kotlin/net/corda/traderdemo/flow/BuyerFlow.kt | 2 +- .../kotlin/net/corda/testing/performance/Injectors.kt | 1 - .../main/kotlin/net/corda/testing/performance}/Rate.kt | 8 ++++---- 25 files changed, 34 insertions(+), 34 deletions(-) rename core/src/main/kotlin/net/corda/core/{utilities => internal}/Emoji.kt (94%) rename core/src/main/kotlin/net/corda/core/{utilities => internal}/LazyPool.kt (96%) rename core/src/main/kotlin/net/corda/core/{utilities => internal}/LazyStickyPool.kt (98%) rename core/src/main/kotlin/net/corda/core/{utilities => internal}/LifeCycle.kt (97%) rename {core/src/main/kotlin/net/corda/core/utilities => test-utils/src/main/kotlin/net/corda/testing/performance}/Rate.kt (71%) diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt index e83363b7fc..e0cb142d82 100644 --- a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt +++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt @@ -14,6 +14,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder import net.corda.core.ThreadBox import net.corda.core.crypto.random63BitValue import net.corda.core.getOrThrow +import net.corda.core.internal.LazyPool +import net.corda.core.internal.LazyStickyPool +import net.corda.core.internal.LifeCycle import net.corda.core.messaging.RPCOps import net.corda.core.serialization.KryoPoolWithContext import net.corda.core.utilities.* diff --git a/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt b/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt index 5684d53ca6..b9d64a3cab 100644 --- a/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt +++ b/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt @@ -5,7 +5,7 @@ import net.corda.client.rpc.internal.RPCClientConfiguration import net.corda.core.messaging.RPCOps import net.corda.core.utilities.minutes import net.corda.core.utilities.seconds -import net.corda.core.utilities.div +import net.corda.testing.performance.div import net.corda.node.services.messaging.RPCServerConfiguration import net.corda.testing.RPCDriverExposedDSLInterface import net.corda.testing.measure diff --git a/core/src/main/kotlin/net/corda/core/Utils.kt b/core/src/main/kotlin/net/corda/core/Utils.kt index 44b4ebf5a3..4654d4cd4d 100644 --- a/core/src/main/kotlin/net/corda/core/Utils.kt +++ b/core/src/main/kotlin/net/corda/core/Utils.kt @@ -310,12 +310,6 @@ private class ObservableToFuture(observable: Observable) : AbstractFuture< /** Return the sum of an Iterable of [BigDecimal]s. */ fun Iterable.sum(): BigDecimal = fold(BigDecimal.ZERO) { a, b -> a + b } -fun codePointsString(vararg codePoints: Int): String { - val builder = StringBuilder() - codePoints.forEach { builder.append(Character.toChars(it)) } - return builder.toString() -} - fun Class.checkNotUnorderedHashMap() { if (HashMap::class.java.isAssignableFrom(this) && !LinkedHashMap::class.java.isAssignableFrom(this)) { throw NotSerializableException("Map type $this is unstable under iteration. Suggested fix: use LinkedHashMap instead.") diff --git a/core/src/main/kotlin/net/corda/core/utilities/Emoji.kt b/core/src/main/kotlin/net/corda/core/internal/Emoji.kt similarity index 94% rename from core/src/main/kotlin/net/corda/core/utilities/Emoji.kt rename to core/src/main/kotlin/net/corda/core/internal/Emoji.kt index f2a6a6b566..25a09dec00 100644 --- a/core/src/main/kotlin/net/corda/core/utilities/Emoji.kt +++ b/core/src/main/kotlin/net/corda/core/internal/Emoji.kt @@ -1,6 +1,4 @@ -package net.corda.core.utilities - -import net.corda.core.codePointsString +package net.corda.core.internal /** * A simple wrapper class that contains icons and support for printing them only when we're connected to a terminal. @@ -79,4 +77,9 @@ object Emoji { } } + private fun codePointsString(vararg codePoints: Int): String { + val builder = StringBuilder() + codePoints.forEach { builder.append(Character.toChars(it)) } + return builder.toString() + } } diff --git a/core/src/main/kotlin/net/corda/core/utilities/LazyPool.kt b/core/src/main/kotlin/net/corda/core/internal/LazyPool.kt similarity index 96% rename from core/src/main/kotlin/net/corda/core/utilities/LazyPool.kt rename to core/src/main/kotlin/net/corda/core/internal/LazyPool.kt index 2649924aa1..3e4e3a526d 100644 --- a/core/src/main/kotlin/net/corda/core/utilities/LazyPool.kt +++ b/core/src/main/kotlin/net/corda/core/internal/LazyPool.kt @@ -1,7 +1,6 @@ -package net.corda.core.utilities +package net.corda.core.internal import java.util.concurrent.ConcurrentLinkedQueue -import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.Semaphore /** diff --git a/core/src/main/kotlin/net/corda/core/utilities/LazyStickyPool.kt b/core/src/main/kotlin/net/corda/core/internal/LazyStickyPool.kt similarity index 98% rename from core/src/main/kotlin/net/corda/core/utilities/LazyStickyPool.kt rename to core/src/main/kotlin/net/corda/core/internal/LazyStickyPool.kt index f44723b6b8..6746989291 100644 --- a/core/src/main/kotlin/net/corda/core/utilities/LazyStickyPool.kt +++ b/core/src/main/kotlin/net/corda/core/internal/LazyStickyPool.kt @@ -1,4 +1,4 @@ -package net.corda.core.utilities +package net.corda.core.internal import java.util.* import java.util.concurrent.LinkedBlockingQueue diff --git a/core/src/main/kotlin/net/corda/core/utilities/LifeCycle.kt b/core/src/main/kotlin/net/corda/core/internal/LifeCycle.kt similarity index 97% rename from core/src/main/kotlin/net/corda/core/utilities/LifeCycle.kt rename to core/src/main/kotlin/net/corda/core/internal/LifeCycle.kt index bc73e9f51a..96786ea3e9 100644 --- a/core/src/main/kotlin/net/corda/core/utilities/LifeCycle.kt +++ b/core/src/main/kotlin/net/corda/core/internal/LifeCycle.kt @@ -1,4 +1,4 @@ -package net.corda.core.utilities +package net.corda.core.internal import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.withLock diff --git a/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt b/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt index 8db0fdbd8a..f91119f9e8 100644 --- a/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt +++ b/core/src/main/kotlin/net/corda/core/serialization/Kryo.kt @@ -12,7 +12,7 @@ import net.corda.core.crypto.* import net.corda.core.crypto.composite.CompositeKey import net.corda.core.identity.Party import net.corda.core.transactions.WireTransaction -import net.corda.core.utilities.LazyPool +import net.corda.core.internal.LazyPool import net.corda.core.utilities.OpaqueBytes import net.i2p.crypto.eddsa.EdDSAPrivateKey import net.i2p.crypto.eddsa.EdDSAPublicKey diff --git a/core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt b/core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt index 684ad86f9b..af16bd728a 100644 --- a/core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt +++ b/core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt @@ -13,7 +13,7 @@ import net.corda.core.serialization.SerializedBytes import net.corda.core.serialization.deserialize import net.corda.core.serialization.p2PKryo import net.corda.core.serialization.serialize -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import java.security.PublicKey import java.security.SignatureException import java.util.function.Predicate diff --git a/core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt b/core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt index 000e81afcc..e891f4677c 100644 --- a/core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt +++ b/core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt @@ -11,7 +11,7 @@ import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.startFlow import net.corda.core.node.services.unconsumedStates import net.corda.core.transactions.SignedTransaction -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.core.utilities.OpaqueBytes import net.corda.flows.CashIssueFlow import net.corda.node.internal.CordaRPCOpsImpl diff --git a/finance/src/main/kotlin/net/corda/contracts/CommercialPaper.kt b/finance/src/main/kotlin/net/corda/contracts/CommercialPaper.kt index f3d2fcdb2e..e175b4c5b1 100644 --- a/finance/src/main/kotlin/net/corda/contracts/CommercialPaper.kt +++ b/finance/src/main/kotlin/net/corda/contracts/CommercialPaper.kt @@ -18,7 +18,7 @@ import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.PersistentState import net.corda.core.schemas.QueryableState import net.corda.core.transactions.TransactionBuilder -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.schemas.CommercialPaperSchemaV1 import java.time.Instant import java.util.* diff --git a/finance/src/main/kotlin/net/corda/contracts/CommercialPaperLegacy.kt b/finance/src/main/kotlin/net/corda/contracts/CommercialPaperLegacy.kt index 0c3811556b..e263e1077c 100644 --- a/finance/src/main/kotlin/net/corda/contracts/CommercialPaperLegacy.kt +++ b/finance/src/main/kotlin/net/corda/contracts/CommercialPaperLegacy.kt @@ -9,7 +9,7 @@ import net.corda.core.identity.AbstractParty import net.corda.core.identity.Party import net.corda.core.node.services.VaultService import net.corda.core.transactions.TransactionBuilder -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import java.time.Instant import java.util.* diff --git a/finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt b/finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt index f47fb51ec1..1e47041843 100644 --- a/finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt +++ b/finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt @@ -20,7 +20,7 @@ import net.corda.core.schemas.PersistentState import net.corda.core.schemas.QueryableState import net.corda.core.serialization.CordaSerializable import net.corda.core.transactions.TransactionBuilder -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.schemas.CashSchemaV1 import org.bouncycastle.asn1.x500.X500Name import java.math.BigInteger diff --git a/finance/src/main/kotlin/net/corda/contracts/asset/Obligation.kt b/finance/src/main/kotlin/net/corda/contracts/asset/Obligation.kt index ec2643b9fd..f07f06ffea 100644 --- a/finance/src/main/kotlin/net/corda/contracts/asset/Obligation.kt +++ b/finance/src/main/kotlin/net/corda/contracts/asset/Obligation.kt @@ -16,7 +16,7 @@ import net.corda.core.identity.AnonymousParty import net.corda.core.identity.Party import net.corda.core.serialization.CordaSerializable import net.corda.core.transactions.TransactionBuilder -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.core.utilities.NonEmptySet import net.corda.core.utilities.seconds import org.bouncycastle.asn1.x500.X500Name diff --git a/finance/src/test/kotlin/net/corda/contracts/DummyFungibleContract.kt b/finance/src/test/kotlin/net/corda/contracts/DummyFungibleContract.kt index e73cce41ce..c30e73135d 100644 --- a/finance/src/test/kotlin/net/corda/contracts/DummyFungibleContract.kt +++ b/finance/src/test/kotlin/net/corda/contracts/DummyFungibleContract.kt @@ -16,7 +16,7 @@ import net.corda.core.schemas.PersistentState import net.corda.core.schemas.QueryableState import net.corda.core.serialization.CordaSerializable import net.corda.core.transactions.TransactionBuilder -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.schemas.SampleCashSchemaV1 import net.corda.schemas.SampleCashSchemaV2 import net.corda.schemas.SampleCashSchemaV3 diff --git a/node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt b/node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt index 00421c1ce2..f6f56fc5d9 100644 --- a/node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt @@ -10,7 +10,7 @@ import net.corda.core.messaging.startFlow import net.corda.core.utilities.minutes import net.corda.core.node.services.ServiceInfo import net.corda.core.utilities.OpaqueBytes -import net.corda.core.utilities.div +import net.corda.testing.performance.div import net.corda.flows.CashIssueFlow import net.corda.flows.CashPaymentFlow import net.corda.node.services.startFlowPermission 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 33bdffcadc..e42b76c68c 100644 --- a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt +++ b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt @@ -10,7 +10,7 @@ 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 +import net.corda.core.internal.Emoji import net.corda.core.utilities.loggerFor import net.corda.node.ArgsParser import net.corda.node.CmdLineOptions diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt b/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt index 8548520ba7..cb42b35110 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt @@ -13,6 +13,8 @@ import com.google.common.collect.Multimaps import com.google.common.collect.SetMultimap import com.google.common.util.concurrent.ThreadFactoryBuilder import net.corda.core.crypto.random63BitValue +import net.corda.core.internal.LazyStickyPool +import net.corda.core.internal.LifeCycle import net.corda.core.messaging.RPCOps import net.corda.core.utilities.seconds import net.corda.core.serialization.KryoPoolWithContext 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 b9ed79ce82..945a5318f9 100644 --- a/node/src/main/kotlin/net/corda/node/shell/InteractiveShell.kt +++ b/node/src/main/kotlin/net/corda/node/shell/InteractiveShell.kt @@ -18,7 +18,7 @@ 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 +import net.corda.core.internal.Emoji import net.corda.core.utilities.loggerFor import net.corda.jackson.JacksonSupport import net.corda.jackson.StringToMethodCallParser diff --git a/node/src/main/kotlin/net/corda/node/utilities/ANSIProgressRenderer.kt b/node/src/main/kotlin/net/corda/node/utilities/ANSIProgressRenderer.kt index e8b6de4269..8339d0ae22 100644 --- a/node/src/main/kotlin/net/corda/node/utilities/ANSIProgressRenderer.kt +++ b/node/src/main/kotlin/net/corda/node/utilities/ANSIProgressRenderer.kt @@ -1,6 +1,6 @@ package net.corda.node.utilities -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.core.utilities.ProgressTracker import net.corda.node.utilities.ANSIProgressRenderer.progressTracker import org.apache.logging.log4j.LogManager diff --git a/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt b/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt index 88ac8380cc..0d42bf06ce 100644 --- a/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt +++ b/samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt @@ -19,7 +19,7 @@ import net.corda.core.identity.Party import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.startTrackedFlow import net.corda.core.transactions.SignedTransaction -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.ProgressTracker import net.corda.testing.DUMMY_BANK_B diff --git a/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemoClientApi.kt b/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemoClientApi.kt index 7f2ddbee4e..062a2fc426 100644 --- a/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemoClientApi.kt +++ b/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemoClientApi.kt @@ -13,7 +13,7 @@ import net.corda.core.getOrThrow import net.corda.core.messaging.CordaRPCOps import net.corda.core.messaging.startFlow import net.corda.core.utilities.OpaqueBytes -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.core.utilities.loggerFor import net.corda.flows.IssuerFlow.IssuanceRequester import net.corda.testing.BOC diff --git a/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/flow/BuyerFlow.kt b/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/flow/BuyerFlow.kt index 5dbdcbf7ef..aebcef0c28 100644 --- a/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/flow/BuyerFlow.kt +++ b/samples/trader-demo/src/main/kotlin/net/corda/traderdemo/flow/BuyerFlow.kt @@ -9,7 +9,7 @@ import net.corda.core.flows.InitiatedBy import net.corda.core.identity.Party import net.corda.core.node.NodeInfo import net.corda.core.transactions.SignedTransaction -import net.corda.core.utilities.Emoji +import net.corda.core.internal.Emoji import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.unwrap import net.corda.flows.TwoPartyTradeFlow diff --git a/test-utils/src/main/kotlin/net/corda/testing/performance/Injectors.kt b/test-utils/src/main/kotlin/net/corda/testing/performance/Injectors.kt index 5690d0dba9..c57e9a165f 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/performance/Injectors.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/performance/Injectors.kt @@ -3,7 +3,6 @@ package net.corda.testing.performance import com.codahale.metrics.Gauge import com.codahale.metrics.MetricRegistry import com.google.common.base.Stopwatch -import net.corda.core.utilities.Rate import net.corda.testing.driver.ShutdownManager import java.time.Duration import java.util.* diff --git a/core/src/main/kotlin/net/corda/core/utilities/Rate.kt b/test-utils/src/main/kotlin/net/corda/testing/performance/Rate.kt similarity index 71% rename from core/src/main/kotlin/net/corda/core/utilities/Rate.kt rename to test-utils/src/main/kotlin/net/corda/testing/performance/Rate.kt index 1936a27fa3..8a01bd4c27 100644 --- a/core/src/main/kotlin/net/corda/core/utilities/Rate.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/performance/Rate.kt @@ -1,4 +1,4 @@ -package net.corda.core.utilities +package net.corda.testing.performance import java.time.Duration import java.time.temporal.ChronoUnit @@ -21,9 +21,9 @@ data class Rate( /** * Converts the number of events to the given unit. */ - operator fun times(inUnit: TimeUnit): Long { - return inUnit.convert(numberOfEvents, perTimeUnit) - } + operator fun times(inUnit: TimeUnit): Long = inUnit.convert(numberOfEvents, perTimeUnit) + + override fun toString(): String = "$numberOfEvents / ${perTimeUnit.name.dropLast(1).toLowerCase()}" // drop the "s" at the end } operator fun Long.div(timeUnit: TimeUnit) = Rate(this, timeUnit)