add a conf method to Jooby fix jooby-project#428

jknack · jknack · commit 93b2921bde65 · 2016-07-22T21:12:27.000-03:00
diff --git a/jooby/src/main/java/org/jooby/Jooby.java b/jooby/src/main/java/org/jooby/Jooby.java
@@ -3297,6 +3297,30 @@ public Jooby use(final Jooby.Module module) {
     return this;
   }
 
+  /**
+   * Set/specify a custom .conf file, useful when you don't want a <code>application.conf</code>
+   * file.
+   *
+   * @param path Classpath location.
+   * @return This jooby instance.
+   */
+  public Jooby conf(final String path) {
+    use(ConfigFactory.parseResources(path));
+    return this;
+  }
+
+  /**
+   * Set/specify a custom .conf file, useful when you don't want a <code>application.conf</code>
+   * file.
+   *
+   * @param path File system location.
+   * @return This jooby instance.
+   */
+  public Jooby conf(final File path) {
+    use(ConfigFactory.parseFile(path));
+    return this;
+  }
+
   /**
    * Set the application configuration object. You must call this method when the default file
    * name: <code>application.conf</code> doesn't work for you or when you need/want to register two
@@ -3307,7 +3331,7 @@ public Jooby use(final Jooby.Module module) {
    * @see Config
    */
   public Jooby use(final Config config) {
-    this.srcconf = requireNonNull(config, "A config is required.");
+    this.srcconf = requireNonNull(config, "Config required.");
     return this;
   }
 
diff --git a/jooby/src/test/java/org/jooby/JoobyTest.java b/jooby/src/test/java/org/jooby/JoobyTest.java
@@ -2704,17 +2704,16 @@ public void useConfig() throws Exception {
         .expect(webSockets)
         .expect(tmpdir)
         .expect(err)
-        .expect(
-            unit -> {
-              AnnotatedBindingBuilder<List<Integer>> listAnnotatedBinding = unit
-                  .mock(AnnotatedBindingBuilder.class);
-              listAnnotatedBinding.toInstance(Arrays.asList(1, 2, 3));
+        .expect(unit -> {
+          AnnotatedBindingBuilder<List<Integer>> listAnnotatedBinding = unit
+              .mock(AnnotatedBindingBuilder.class);
+          listAnnotatedBinding.toInstance(Arrays.asList(1, 2, 3));
 
-              Binder binder = unit.get(Binder.class);
-              Key<List<Integer>> key = (Key<List<Integer>>) Key.get(Types.listOf(Integer.class),
-                  Names.named("list"));
-              expect(binder.bind(key)).andReturn(listAnnotatedBinding);
-            })
+          Binder binder = unit.get(Binder.class);
+          Key<List<Integer>> key = (Key<List<Integer>>) Key.get(Types.listOf(Integer.class),
+              Names.named("list"));
+          expect(binder.bind(key)).andReturn(listAnnotatedBinding);
+        })
         .run(unit -> {
 
           Jooby jooby = new Jooby();
@@ -2726,6 +2725,80 @@ public void useConfig() throws Exception {
         }, boot);
   }
 
+  @Test
+  public void customConf() throws Exception {
+
+    new MockUnit(Binder.class)
+        .expect(guice)
+        .expect(shutdown)
+        .expect(config)
+        .expect(env)
+        .expect(classInfo)
+        .expect(ssl)
+        .expect(charset)
+        .expect(locale)
+        .expect(zoneId)
+        .expect(timeZone)
+        .expect(dateTimeFormatter)
+        .expect(numberFormat)
+        .expect(decimalFormat)
+        .expect(renderers)
+        .expect(session)
+        .expect(routes)
+        .expect(routeHandler)
+        .expect(params)
+        .expect(requestScope)
+        .expect(webSockets)
+        .expect(tmpdir)
+        .expect(err)
+        .run(unit -> {
+
+          Jooby jooby = new Jooby();
+
+          jooby.conf("JoobyTest.conf");
+
+          jooby.start();
+
+        }, boot);
+  }
+
+  @Test
+  public void customConfFile() throws Exception {
+
+    new MockUnit(Binder.class)
+        .expect(guice)
+        .expect(shutdown)
+        .expect(config)
+        .expect(env)
+        .expect(classInfo)
+        .expect(ssl)
+        .expect(charset)
+        .expect(locale)
+        .expect(zoneId)
+        .expect(timeZone)
+        .expect(dateTimeFormatter)
+        .expect(numberFormat)
+        .expect(decimalFormat)
+        .expect(renderers)
+        .expect(session)
+        .expect(routes)
+        .expect(routeHandler)
+        .expect(params)
+        .expect(requestScope)
+        .expect(webSockets)
+        .expect(tmpdir)
+        .expect(err)
+        .run(unit -> {
+
+          Jooby jooby = new Jooby();
+
+          jooby.conf(new File("JoobyTest.conf"));
+
+          jooby.start();
+
+        }, boot);
+  }
+
   @Test
   public void useMissingConfig() throws Exception {
 
