mirror of
https://github.com/corda/corda.git
synced 2025-03-14 08:16:32 +00:00
More Fixes to cleanup after GitHub
This commit is contained in:
parent
8925ca8954
commit
c84bb7ebe0
@ -69,8 +69,8 @@ class BridgeAMQPListenerServiceImpl(val conf: BridgeConfiguration,
|
||||
keyStorePrivateKeyPassword,
|
||||
trustStore,
|
||||
conf.crlCheckSoftFail,
|
||||
conf.enableAMQPPacketTrace,
|
||||
maxMessageSize)
|
||||
maxMessageSize,
|
||||
conf.enableAMQPPacketTrace)
|
||||
onConnectSubscription = server.onConnection.subscribe(_onConnection)
|
||||
onConnectAuditSubscription = server.onConnection.subscribe {
|
||||
if (it.connected) {
|
||||
|
@ -91,8 +91,8 @@ class FloatControlListenerService(val conf: BridgeConfiguration,
|
||||
keyStorePrivateKeyPassword,
|
||||
trustStore,
|
||||
conf.crlCheckSoftFail,
|
||||
conf.enableAMQPPacketTrace,
|
||||
maxMessageSize)
|
||||
maxMessageSize,
|
||||
conf.enableAMQPPacketTrace)
|
||||
connectSubscriber = controlServer.onConnection.subscribe { onConnectToControl(it) }
|
||||
receiveSubscriber = controlServer.onReceive.subscribe { onControlMessage(it) }
|
||||
amqpControlServer = controlServer
|
||||
|
@ -81,8 +81,8 @@ class TunnelingBridgeReceiverService(val conf: BridgeConfiguration,
|
||||
controLinkKeyStorePrivateKeyPassword,
|
||||
controlLinkTrustStore,
|
||||
conf.crlCheckSoftFail,
|
||||
conf.enableAMQPPacketTrace,
|
||||
maxMessageSize = maxMessageSize)
|
||||
maxMessageSize,
|
||||
conf.enableAMQPPacketTrace)
|
||||
connectSubscriber = controlClient.onConnection.subscribe { onConnectToControl(it) }
|
||||
receiveSubscriber = controlClient.onReceive.subscribe { onFloatMessage(it) }
|
||||
amqpControlClient = controlClient
|
||||
|
@ -8,10 +8,7 @@ import net.corda.nodeapi.internal.crypto.X509KeyStore
|
||||
import net.corda.nodeapi.internal.protonwrapper.messages.MessageStatus
|
||||
import net.corda.nodeapi.internal.protonwrapper.netty.AMQPClient
|
||||
import net.corda.nodeapi.internal.protonwrapper.netty.AMQPServer
|
||||
import net.corda.testing.core.ALICE_NAME
|
||||
import net.corda.testing.core.BOB_NAME
|
||||
import net.corda.testing.core.CHARLIE_NAME
|
||||
import net.corda.testing.core.freePort
|
||||
import net.corda.testing.core.*
|
||||
import org.bouncycastle.jce.provider.BouncyCastleProvider
|
||||
import org.junit.Before
|
||||
import org.junit.Ignore
|
||||
@ -89,7 +86,8 @@ class CertificateRevocationListNodeTests {
|
||||
sslS,
|
||||
"cordacadevpass",
|
||||
tS,
|
||||
false)
|
||||
false,
|
||||
MAX_MESSAGE_SIZE)
|
||||
}
|
||||
|
||||
private fun createServer(port: Int): AMQPServer {
|
||||
@ -103,6 +101,7 @@ class CertificateRevocationListNodeTests {
|
||||
sslS,
|
||||
"cordacadevpass",
|
||||
tS,
|
||||
false)
|
||||
false,
|
||||
MAX_MESSAGE_SIZE)
|
||||
}
|
||||
}
|
||||
|
@ -67,10 +67,10 @@ class AMQPClient(val targets: List<NetworkHostAndPort>,
|
||||
private val keyStorePrivateKeyPassword: String,
|
||||
private val trustStore: KeyStore,
|
||||
private val crlCheckSoftFail: Boolean,
|
||||
private val maxMessageSize: Int,
|
||||
private val trace: Boolean = false,
|
||||
private val sharedThreadPool: EventLoopGroup? = null,
|
||||
private val socksProxyConfig: SocksProxyConfig? = null,
|
||||
private val maxMessageSize: Int) : AutoCloseable {
|
||||
private val socksProxyConfig: SocksProxyConfig? = null) : AutoCloseable {
|
||||
companion object {
|
||||
init {
|
||||
InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE)
|
||||
|
@ -52,8 +52,8 @@ class AMQPServer(val hostName: String,
|
||||
private val keyStorePrivateKeyPassword: CharArray,
|
||||
private val trustStore: KeyStore,
|
||||
private val crlCheckSoftFail: Boolean,
|
||||
private val trace: Boolean = false,
|
||||
private val maxMessageSize: Int) : AutoCloseable {
|
||||
private val maxMessageSize: Int,
|
||||
private val trace: Boolean = false) : AutoCloseable {
|
||||
|
||||
companion object {
|
||||
init {
|
||||
@ -80,8 +80,8 @@ class AMQPServer(val hostName: String,
|
||||
keyStorePrivateKeyPassword: String,
|
||||
trustStore: KeyStore,
|
||||
crlCheckSoftFail: Boolean,
|
||||
trace: Boolean = false,
|
||||
maxMessageSize: Int) : this(hostName, port, userName, password, keyStore, keyStorePrivateKeyPassword.toCharArray(), trustStore, crlCheckSoftFail, trace, maxMessageSize)
|
||||
maxMessageSize: Int,
|
||||
trace: Boolean = false) : this(hostName, port, userName, password, keyStore, keyStorePrivateKeyPassword.toCharArray(), trustStore, crlCheckSoftFail, maxMessageSize, trace)
|
||||
|
||||
private class ServerChannelInitializer(val parent: AMQPServer) : ChannelInitializer<SocketChannel>() {
|
||||
private val keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
|
||||
|
Loading…
x
Reference in New Issue
Block a user