anthonyraymond/joal
1
1
Fork 0
mirror of https://github.com/anthonyraymond/joal.git synced 2024-09-20 15:26:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added logger to JoalConfProvider

Browse source
This commit is contained in:
anthonyraymond 2017-04-29 00:10:13 +02:00
parent afb253e589
commit be153810c8
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/araymond/joal/core/config/JoalConfigProvider.java
View file

@ -37,14 +37,18 @@ public class JoalConfigProvider implements Provider<AppConfiguration> {
}
this.joalConfPath = Paths.get(confFolder).resolve(CONF_FILE_NAME);
if (!Files.exists(joalConfPath)) {
throw new FileNotFoundException(String.format("Configuration file '%s' not found.", joalConfPath));
throw new FileNotFoundException(String.format("App configuration file '%s' not found.", joalConfPath));
}
if (logger.isDebugEnabled()) {
logger.debug("App configuration file will be searched for in {}", joalConfPath.toAbsolutePath());
}
}
@Override
public AppConfiguration get() {
if (this.isDirty || this.config == null) {
logger.info("App configuration is dirty or has not been loaded yet.");
this.config = loadConfiguration();
}
return this.config;
@ -52,6 +56,7 @@ public class JoalConfigProvider implements Provider<AppConfiguration> {
// TODO: implement a watcher to check if config is updated (and then set isDirty)
void setDirtyState() {
logger.debug("App configuration has been set to dirty state.");
this.isDirty = true;
}
@ -59,11 +64,17 @@ public class JoalConfigProvider implements Provider<AppConfiguration> {
AppConfiguration loadConfiguration() {
final AppConfiguration configuration;
try {
if (logger.isDebugEnabled()) {
logger.debug("Reading json configuration from '{}'.", joalConfPath.toAbsolutePath());
}
configuration = objectMapper.readValue(joalConfPath.toFile(), AppConfiguration.class);
logger.debug("Successfully red json configuration.");
} catch (final IOException e) {
logger.error("Failed to read configuration file", e);
throw new IllegalStateException(e);
}
this.isDirty = false;
logger.info("App configuration has been successfully loaded.");
return configuration;
}

2
src/test/java/org/araymond/joal/core/config/JoalConfigProviderTest.java
View file

@ -37,7 +37,7 @@ public class JoalConfigProviderTest {
final String fakePath = resourcePath.resolve("nop").toString();
assertThatThrownBy(() ->new JoalConfigProvider(new ObjectMapper(), fakePath))
.isInstanceOf(FileNotFoundException.class)
.hasMessageContaining("Configuration file '" + fakePath + "\\config.json' not found.");
.hasMessageContaining("App configuration file '" + fakePath + "\\config.json' not found.");
}
@Test