Moved a bunch of stuff which shouldn't be public out of core.utilities and into core.internal

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.*

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

core/src/main/kotlin/net/corda/core/Utils.kt

@@ -310,12 +310,6 @@ private class ObservableToFuture<T>(observable: Observable<T>) : AbstractFuture<
 /** Return the sum of an Iterable of [BigDecimal]s. */
 fun Iterable<BigDecimal>.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 <T> Class<T>.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.")

core/src/main/kotlin/net/corda/core/internal/Emoji.kt

@@ -1,6 +1,4 @@
-package net.corda.core.utilities
+package net.corda.core.internal
-
-import net.corda.core.codePointsString
 
 /**
  * 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()
+    }
 }

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
 
 /**

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

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

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

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

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

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.*

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.*
 

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

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

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

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

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

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

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

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

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

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

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

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.*

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 {
+    operator fun times(inUnit: TimeUnit): Long = inUnit.convert(numberOfEvents, perTimeUnit)
-        return 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)