Skip to content

Commit 4a81485

Browse files
committed
better error message when assets.conf is missing #1324
1 parent 1c75a82 commit 4a81485

File tree

1 file changed

+8
-3
lines changed
  • modules/jooby-assets/src/main/java/org/jooby/assets

1 file changed

+8
-3
lines changed

modules/jooby-assets/src/main/java/org/jooby/assets/Assets.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@
219219
import org.slf4j.LoggerFactory;
220220

221221
import java.io.File;
222+
import java.io.FileNotFoundException;
223+
import java.io.IOException;
222224
import java.nio.file.Path;
223225
import java.nio.file.Paths;
224226
import java.util.List;
@@ -568,10 +570,10 @@ public void configure(final Env env, final Config config, final Binder binder) t
568570
return ConfigFactory.parseResources(getClass(), "assets.conf");
569571
}
570572

571-
private Config conf(final boolean dev, final ClassLoader loader, final Config conf) {
572-
final Config[] confs;
573+
private Config conf(final boolean dev, final ClassLoader loader, final Config conf) throws
574+
IOException {
573575
if (!dev) {
574-
confs = new Config[]{
576+
Config[] confs = {
575577
ConfigFactory.parseResources(loader,
576578
"assets." + conf.getString("application.env").toLowerCase() + ".conf"),
577579
ConfigFactory.parseResources(loader, "assets.dist.conf"),
@@ -582,6 +584,9 @@ private Config conf(final boolean dev, final ClassLoader loader, final Config co
582584
}
583585
}
584586
}
587+
if (loader.getResource("assets.conf") == null) {
588+
throw new FileNotFoundException("assets.conf");
589+
}
585590
return ConfigFactory.parseResources(loader, "assets.conf").withFallback(conf).resolve();
586591
}
587592

0 commit comments

Comments
 (0)