Rename function to comply with proxy method name

dropwizard · Aug 11, 2016 · a6b55d1 · a6b55d1
1 parent b93b722
commit a6b55d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/dropwizard-jetty/src/main/java/io/dropwizard/jetty/setup/ServletEnvironment.java b/dropwizard-jetty/src/main/java/io/dropwizard/jetty/setup/ServletEnvironment.java
@@ -147,27 +147,26 @@ public void setBaseResource(Resource... baseResources) {
         handler.setBaseResource(new ResourceCollection(baseResources));
     }
 
-    /**
-     * Sets the base resource for this context.
-     * @param resourceBase A string representing the base resource for the context. Any
-     *                     string accepted by Resource.newResource(String) may be passed
-     *                     and the call is equivalent to {@link #setBaseResource(Resource)}}
-     */
-    public void setResourceBase(String resourceBase) {
-        handler.setResourceBase(resourceBase);
-    }
-
     /**
      * Sets the base resources for this context.
      *
      * @param resources A list of strings representing the base resources to serve static
      *                  content for the context. Any string accepted by Resource.newResource(String)
      *                  may be passed and the call is equivalent to {@link #setBaseResource(Resource...)}}
      */
-    public void setResourceBase(String... resources) {
+    public void setBaseResource(String... resources) {
         handler.setBaseResource(new ResourceCollection(resources));
     }
 
+    /**
+     * Sets the base resource for this context.
+     * @param resourceBase A string representing the base resource for the context. Any
+     *                     string accepted by Resource.newResource(String) may be passed
+     *                     and the call is equivalent to {@link #setBaseResource(Resource)}}
+     */
+    public void setResourceBase(String resourceBase) {
+        handler.setResourceBase(resourceBase);
+    }
 
     /**
      * Set an initialization parameter.

diff --git a/dropwizard-jetty/src/test/java/io/dropwizard/jetty/setup/ServletEnvironmentTest.java b/dropwizard-jetty/src/test/java/io/dropwizard/jetty/setup/ServletEnvironmentTest.java
@@ -161,12 +161,12 @@ public void setsResourceBase() throws Exception {
     }
 
     @Test
-    public void setsResourceBaseList() throws Exception {
+    public void setsBaseResourceStringList() throws Exception {
         String wooResource = tempDir.newFolder().getAbsolutePath();
         String fooResource = tempDir.newFolder().getAbsolutePath();
 
         final String[] testResources = new String[]{wooResource, fooResource};
-        environment.setResourceBase(testResources);
+        environment.setBaseResource(testResources);
 
         ArgumentCaptor<Resource> captor = ArgumentCaptor.forClass(Resource.class);
         verify(handler).setBaseResource(captor.capture());