From 8a098d81caf0fa2c3ace63d5cf9303f92c29c6af Mon Sep 17 00:00:00 2001 From: carbotaniuman <41451839+carbotaniuman@users.noreply.github.com> Date: Tue, 9 Jun 2020 14:21:29 -0500 Subject: [PATCH] Formatting --- src/main/kotlin/mdnet/base/Application.kt | 2 +- src/main/kotlin/mdnet/base/Keys.kt | 4 ---- src/main/kotlin/mdnet/base/Netty.kt | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/mdnet/base/Application.kt b/src/main/kotlin/mdnet/base/Application.kt index ed2aac0..f314710 100644 --- a/src/main/kotlin/mdnet/base/Application.kt +++ b/src/main/kotlin/mdnet/base/Application.kt @@ -39,7 +39,7 @@ import javax.crypto.CipherOutputStream import javax.crypto.spec.SecretKeySpec private val LOGGER = LoggerFactory.getLogger("Application") -private val THREADS_TO_ALLOCATE = Runtime.getRuntime().availableProcessors() * 30 / 2 ; +private val THREADS_TO_ALLOCATE = Runtime.getRuntime().availableProcessors() * 30 / 2 fun getServer(cache: DiskLruCache, serverSettings: ServerSettings, clientSettings: ClientSettings, statistics: AtomicReference): Http4kServer { val executor = Executors.newCachedThreadPool() diff --git a/src/main/kotlin/mdnet/base/Keys.kt b/src/main/kotlin/mdnet/base/Keys.kt index 0216796..250f4ae 100644 --- a/src/main/kotlin/mdnet/base/Keys.kt +++ b/src/main/kotlin/mdnet/base/Keys.kt @@ -21,13 +21,9 @@ //SOFTWARE. package mdnet.base -import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream -import java.io.InputStream import java.security.KeyFactory import java.security.PrivateKey -import java.security.cert.CertificateFactory -import java.security.cert.X509Certificate import java.security.spec.InvalidKeySpecException import java.security.spec.PKCS8EncodedKeySpec diff --git a/src/main/kotlin/mdnet/base/Netty.kt b/src/main/kotlin/mdnet/base/Netty.kt index 11596e4..bb2d969 100644 --- a/src/main/kotlin/mdnet/base/Netty.kt +++ b/src/main/kotlin/mdnet/base/Netty.kt @@ -98,10 +98,10 @@ class Netty(private val tls: ServerSettings.TlsCert, private val clientSettings: counter.resetCumulativeTime() } } - private val limiter = ConnectionCounter(); + private val limiter = ConnectionCounter() override fun start(): Http4kServer = apply { - val (mainCert, chainCert) = getX509Certs(tls.certificate); + val (mainCert, chainCert) = getX509Certs(tls.certificate) val sslContext = SslContextBuilder .forServer(getPrivateKey(tls.privateKey), mainCert, chainCert) .protocols("TLSv1.3", "TLSv.1.2", "TLSv.1.1", "TLSv.1.0") @@ -164,4 +164,4 @@ fun getX509Certs(certificates: String): Pair { fun getPrivateKey(privateKey: String): PrivateKey { return loadKey(privateKey)!! -} \ No newline at end of file +}