diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala index fb93b39d04..e435eab660 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala @@ -5,6 +5,7 @@ package akka.http.javadsl.settings import java.util.{ Optional, Random } +import akka.actor.ActorSystem import akka.http.impl.settings.ClientConnectionSettingsImpl import akka.http.javadsl.model.headers.UserAgent import akka.io.Inet.SocketOption @@ -42,4 +43,5 @@ abstract class ClientConnectionSettings private[akka] () { self: ClientConnectio object ClientConnectionSettings extends SettingsCompanion[ClientConnectionSettings] { def create(config: Config): ClientConnectionSettings = ClientConnectionSettingsImpl(config) def create(configOverrides: String): ClientConnectionSettings = ClientConnectionSettingsImpl(configOverrides) + override def create(system: ActorSystem): ClientConnectionSettings = create(system.settings.config) } diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala index 9c1e42ceef..f1398120ac 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala @@ -3,6 +3,7 @@ */ package akka.http.javadsl.settings +import akka.actor.ActorSystem import akka.http.impl.settings.ConnectionPoolSettingsImpl import com.typesafe.config.Config @@ -34,4 +35,5 @@ abstract class ConnectionPoolSettings private[akka] () { self: ConnectionPoolSet object ConnectionPoolSettings extends SettingsCompanion[ConnectionPoolSettings] { override def create(config: Config): ConnectionPoolSettings = ConnectionPoolSettingsImpl(config) override def create(configOverrides: String): ConnectionPoolSettings = ConnectionPoolSettingsImpl(configOverrides) + override def create(system: ActorSystem): ConnectionPoolSettings = create(system.settings.config) } \ No newline at end of file diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala index 8eec14babf..c977b4ead7 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala @@ -5,6 +5,7 @@ package akka.http.javadsl.settings import java.util.Optional +import akka.actor.ActorSystem import akka.http.impl.engine.parsing.BodyPartParser import akka.http.impl.settings.ParserSettingsImpl import java.{ util ⇒ ju } @@ -83,4 +84,5 @@ object ParserSettings extends SettingsCompanion[ParserSettings] { override def create(config: Config): ParserSettings = ParserSettingsImpl(config) override def create(configOverrides: String): ParserSettings = ParserSettingsImpl(configOverrides) + override def create(system: ActorSystem): ParserSettings = create(system.settings.config) } diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/RoutingSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/RoutingSettings.scala index 5896b5f8a0..7983aabc05 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/RoutingSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/RoutingSettings.scala @@ -3,6 +3,7 @@ */ package akka.http.javadsl.settings +import akka.actor.ActorSystem import akka.http.impl.settings.RoutingSettingsImpl import com.typesafe.config.Config @@ -30,4 +31,5 @@ abstract class RoutingSettings private[akka] () { self: RoutingSettingsImpl ⇒ object RoutingSettings extends SettingsCompanion[RoutingSettings] { override def create(config: Config): RoutingSettings = RoutingSettingsImpl(config) override def create(configOverrides: String): RoutingSettings = RoutingSettingsImpl(configOverrides) + override def create(system: ActorSystem): RoutingSettings = create(system.settings.config) } 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 ec5105968c..b0bed97109 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 @@ -5,6 +5,7 @@ package akka.http.javadsl.settings import java.util.{ Optional, Random } +import akka.actor.ActorSystem import akka.http.impl.settings.ServerSettingsImpl import akka.http.javadsl.model.headers.Host import akka.http.javadsl.model.headers.Server @@ -71,4 +72,5 @@ object ServerSettings extends SettingsCompanion[ServerSettings] { override def create(config: Config): ServerSettings = ServerSettingsImpl(config) override def create(configOverrides: String): ServerSettings = ServerSettingsImpl(configOverrides) + override def create(system: ActorSystem): ServerSettings = create(system.settings.config) } \ No newline at end of file diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/SettingsCompanion.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/SettingsCompanion.scala index c9f7414d43..7f96933323 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/SettingsCompanion.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/SettingsCompanion.scala @@ -10,7 +10,7 @@ trait SettingsCompanion[T] { * * Java API */ - final def create(system: ActorSystem): T = create(system.settings.config) + def create(system: ActorSystem): T = create(system.settings.config) /** * Creates an instance of settings using the given Config. diff --git a/akka-http-core/src/test/java/akka/http/javadsl/settings/ClientConnectionSettingsTest.java b/akka-http-core/src/test/java/akka/http/javadsl/settings/ClientConnectionSettingsTest.java new file mode 100644 index 0000000000..cb99227476 --- /dev/null +++ b/akka-http-core/src/test/java/akka/http/javadsl/settings/ClientConnectionSettingsTest.java @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2009-2016 Lightbend Inc. + */ + +package akka.http.javadsl.settings; + +import akka.actor.ActorSystem; +import org.junit.Test; +import org.scalatest.junit.JUnitSuite; + +public class ClientConnectionSettingsTest extends JUnitSuite { + + @Test + public void testCreateWithActorSystem() { + ActorSystem sys = ActorSystem.create("test"); + ClientConnectionSettings settings = ClientConnectionSettings.create(sys); + } +} diff --git a/akka-http-core/src/test/java/akka/http/javadsl/settings/ConnectionPoolSettingsTest.java b/akka-http-core/src/test/java/akka/http/javadsl/settings/ConnectionPoolSettingsTest.java new file mode 100644 index 0000000000..62f0da1b07 --- /dev/null +++ b/akka-http-core/src/test/java/akka/http/javadsl/settings/ConnectionPoolSettingsTest.java @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2009-2016 Lightbend Inc. + */ + +package akka.http.javadsl.settings; + +import akka.actor.ActorSystem; +import org.junit.Test; +import org.scalatest.junit.JUnitSuite; + +public class ConnectionPoolSettingsTest extends JUnitSuite { + + @Test + public void testCreateWithActorSystem() { + ActorSystem sys = ActorSystem.create("test"); + ConnectionPoolSettings settings = ConnectionPoolSettings.create(sys); + } +} diff --git a/akka-http-core/src/test/java/akka/http/javadsl/settings/ParserSettingsTest.java b/akka-http-core/src/test/java/akka/http/javadsl/settings/ParserSettingsTest.java new file mode 100644 index 0000000000..1ade595117 --- /dev/null +++ b/akka-http-core/src/test/java/akka/http/javadsl/settings/ParserSettingsTest.java @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2009-2016 Lightbend Inc. + */ + +package akka.http.javadsl.settings; + +import akka.actor.ActorSystem; +import org.junit.Test; +import org.scalatest.junit.JUnitSuite; + +public class ParserSettingsTest extends JUnitSuite { + + @Test + public void testCreateWithActorSystem() { + ActorSystem sys = ActorSystem.create("test"); + ParserSettings settings = ParserSettings.create(sys); + } +} diff --git a/akka-http-core/src/test/java/akka/http/javadsl/settings/RoutingSettingsTest.java b/akka-http-core/src/test/java/akka/http/javadsl/settings/RoutingSettingsTest.java new file mode 100644 index 0000000000..902a321cb4 --- /dev/null +++ b/akka-http-core/src/test/java/akka/http/javadsl/settings/RoutingSettingsTest.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2009-2016 Lightbend Inc. + */ + +package akka.http.javadsl.settings; + +import akka.actor.ActorSystem; +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; +import org.junit.Test; +import org.scalatest.junit.JUnitSuite; + +public class RoutingSettingsTest extends JUnitSuite { + + @Test + public void testCreateWithActorSystem() { + String testConfig = + "akka.http.routing {\n" + + " verbose-error-messages = off\n" + + " file-get-conditional = on\n" + + " render-vanity-footer = yes\n" + + " range-coalescing-threshold = 80\n" + + " range-count-limit = 16\n" + + " decode-max-bytes-per-chunk = 1m\n" + + " file-io-dispatcher = \"test-only\"\n" + + "}"; + Config config = ConfigFactory.parseString(testConfig); + ActorSystem sys = ActorSystem.create("test", config); + RoutingSettings settings = RoutingSettings.create(sys); + } +} diff --git a/akka-http-core/src/test/java/akka/http/javadsl/settings/ServerSettingsTest.java b/akka-http-core/src/test/java/akka/http/javadsl/settings/ServerSettingsTest.java new file mode 100644 index 0000000000..b4ae596f06 --- /dev/null +++ b/akka-http-core/src/test/java/akka/http/javadsl/settings/ServerSettingsTest.java @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2009-2016 Lightbend Inc. + */ + +package akka.http.javadsl.settings; + +import akka.actor.ActorSystem; +import org.junit.Test; +import org.scalatest.junit.JUnitSuite; + +public class ServerSettingsTest extends JUnitSuite { + + @Test + public void testCreateWithActorSystem() { + ActorSystem sys = ActorSystem.create("test"); + ServerSettings settings = ServerSettings.create(sys); + } +}