Allow custom plugin loader injection (#213) (#215)

(cherry picked from commit 281d716)
ExpediaGroup · Jul 13, 2018 · 4649557 · 4649557
1 parent cf8c6df
commit 4649557
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/components/proxy/src/main/java/com/hotels/styx/startup/StyxServerComponents.java b/components/proxy/src/main/java/com/hotels/styx/startup/StyxServerComponents.java
@@ -138,10 +138,10 @@ public Builder loggingSetUp(String logConfigLocation) {
         public Builder plugins(Iterable<NamedPlugin> plugins) {
             requireNonNull(plugins);
             List<NamedPlugin> list = ImmutableList.copyOf(plugins);
-            return pluginsLoader(env -> list);
+            return plugins(env -> list);
         }
 
-        public Builder pluginsLoader(PluginsLoader pluginsLoader) {
+        public Builder plugins(PluginsLoader pluginsLoader) {
             this.pluginsLoader = requireNonNull(pluginsLoader);
             return this;
         }

diff --git a/components/proxy/src/test/java/com/hotels/styx/startup/StyxServerComponentsTest.java b/components/proxy/src/test/java/com/hotels/styx/startup/StyxServerComponentsTest.java
@@ -61,7 +61,7 @@ public void setsUpLoggingOnBuild() {
     public void loadsPlugins() {
         StyxServerComponents components = new StyxServerComponents.Builder()
                 .styxConfig(new StyxConfig())
-                .pluginsLoader(env -> ImmutableList.of(
+                .plugins(env -> ImmutableList.of(
                         namedPlugin("plugin1", stubPlugin("MyResponse1")),
                         namedPlugin("plugin2", stubPlugin("MyResponse2"))))
                 .build();

diff --git a/support/test-api/src/main/java/com/hotels/styx/testapi/StyxServer.java b/support/test-api/src/main/java/com/hotels/styx/testapi/StyxServer.java
@@ -75,7 +75,7 @@ private StyxServer(Builder builder) {
 
         StyxServerComponents config = new StyxServerComponents.Builder()
                 .styxConfig(styxConfig(builder))
-                .pluginsLoader(loader)
+                .plugins(loader)
                 .additionalServices(ImmutableMap.of("backendServiceRegistry", new RegistryServiceAdapter(backendServicesRegistry)))
                 .build();