This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 36377c6c9a update Akka refs in PekkoSSLConfig.scala (#198)
36377c6c9a is described below
commit 36377c6c9a66336f2310fd4c1ab75dcbb1d67487
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Feb 16 13:10:35 2023 +0100
update Akka refs in PekkoSSLConfig.scala (#198)
---
.../scala/com/typesafe/sslconfig/pekko/PekkoSSLConfig.scala | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/stream/src/main/scala/com/typesafe/sslconfig/pekko/PekkoSSLConfig.scala
b/stream/src/main/scala/com/typesafe/sslconfig/pekko/PekkoSSLConfig.scala
index 2fe5945330..7ba020c509 100644
--- a/stream/src/main/scala/com/typesafe/sslconfig/pekko/PekkoSSLConfig.scala
+++ b/stream/src/main/scala/com/typesafe/sslconfig/pekko/PekkoSSLConfig.scala
@@ -24,7 +24,8 @@ import pekko.annotation.InternalApi
import pekko.event.Logging
import scala.annotation.nowarn
-@deprecated("Use Tcp and TLS with SSLEngine parameters instead. Setup the
SSLEngine with needed parameters.", "2.6.0")
+@deprecated("Use Tcp and TLS with SSLEngine parameters instead. Setup the
SSLEngine with needed parameters.",
+ "Akka 2.6.0")
object PekkoSSLConfig extends ExtensionId[PekkoSSLConfig] with
ExtensionIdProvider {
//////////////////// EXTENSION SETUP ///////////////////
@@ -39,14 +40,15 @@ object PekkoSSLConfig extends ExtensionId[PekkoSSLConfig]
with ExtensionIdProvid
new PekkoSSLConfig(system, defaultSSLConfigSettings(system))
def defaultSSLConfigSettings(system: ActorSystem): SSLConfigSettings = {
- val akkaOverrides = system.settings.config.getConfig("pekko.ssl-config")
+ val pekkoOverrides = system.settings.config.getConfig("pekko.ssl-config")
val defaults = system.settings.config.getConfig("ssl-config")
- SSLConfigFactory.parse(akkaOverrides.withFallback(defaults))
+ SSLConfigFactory.parse(pekkoOverrides.withFallback(defaults))
}
}
-@deprecated("Use Tcp and TLS with SSLEngine parameters instead. Setup the
SSLEngine with needed parameters.", "2.6.0")
+@deprecated("Use Tcp and TLS with SSLEngine parameters instead. Setup the
SSLEngine with needed parameters.",
+ "Akka 2.6.0")
final class PekkoSSLConfig(system: ExtendedActorSystem, val config:
SSLConfigSettings) extends Extension {
private val mkLogger = new PekkoLoggerFactory(system)
@@ -143,6 +145,8 @@ final class PekkoSSLConfig(system: ExtendedActorSystem, val
config: SSLConfigSet
v
}
+ @deprecated("validateDefaultTrustManager is not doing anything since akka
2.6.19 and should not be used",
+ "Akka 2.6.19")
def validateDefaultTrustManager(@nowarn("msg=never used") sslConfig:
SSLConfigSettings): Unit = {
log.warning(
"validateDefaultTrustManager is not doing anything since akka 2.6.19, it
was useful only in Java 7 and below");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
