From 5ff4868130aeb74fa85a6610ad3fe3b4c0f92f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andre=CC=81n?= Date: Tue, 26 Jan 2016 15:54:32 +0100 Subject: [PATCH] +htt #19618 adding missing factory methods for server settings in Java API --- .../scala/akka/http/javadsl/settings/ServerSettings.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala index f835a2c2e0..927b6cf76c 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala @@ -10,6 +10,7 @@ import akka.http.javadsl.model.headers.Host import akka.http.javadsl.model.headers.Server import akka.io.Inet.SocketOption import akka.http.impl.util.JavaMapping.Implicits._ +import com.typesafe.config.Config import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ @@ -53,7 +54,7 @@ abstract class ServerSettings { self: ServerSettingsImpl ⇒ } -object ServerSettings { +object ServerSettings extends SettingsCompanion[ServerSettings] { trait Timeouts { def idleTimeout: Duration def requestTimeout: Duration @@ -67,4 +68,7 @@ object ServerSettings { /** INTERNAL API */ protected def self = this.asInstanceOf[ServerSettingsImpl.Timeouts] } + + override def create(config: Config): ServerSettings = ServerSettingsImpl(config) + override def create(configOverrides: String): ServerSettings = ServerSettingsImpl(configOverrides) } \ No newline at end of file