Skip to content

Commit 14c7a8c

Browse files
committed
Add debug logging
1 parent 4ddfafe commit 14c7a8c

File tree

7 files changed

+27
-9
lines changed

7 files changed

+27
-9
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Version 3.1.2 (2018-10-18)
2+
3+
* [chg] Add debug logging
4+
15
# Version 3.1.1 (2018-09-03)
26

37
* [fix] Always make ServiceLoader use the most complete classloader it can find.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<groupId>org.seedstack.coffig</groupId>
2121
<artifactId>coffig</artifactId>
22-
<version>3.1.1-SNAPSHOT</version>
22+
<version>3.1.2-SNAPSHOT</version>
2323

2424
<properties>
2525
<shed.version>1.1.3</shed.version>

src/main/java/org/seedstack/coffig/CoffigBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ public Coffig build() {
112112

113113
return new Coffig(
114114
wrap(new EvaluatingMapper(
115-
new CompositeMapper(mappers.toArray(new ConfigurationMapper[mappers.size()])),
116-
new CompositeEvaluator(evaluators.toArray(new ConfigurationEvaluator[evaluators.size()]))
115+
new CompositeMapper(mappers.toArray(new ConfigurationMapper[0])),
116+
new CompositeEvaluator(evaluators.toArray(new ConfigurationEvaluator[0]))
117117
)),
118-
new CompositeProvider(providers.toArray(new ConfigurationProvider[providers.size()])),
119-
new CompositeProcessor(processors.toArray(new ConfigurationProcessor[processors.size()]))
118+
new CompositeProvider(providers.toArray(new ConfigurationProvider[0])),
119+
new CompositeProcessor(processors.toArray(new ConfigurationProcessor[0]))
120120
);
121121
}
122122

src/main/java/org/seedstack/coffig/provider/EnvironmentProvider.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111
import org.seedstack.coffig.node.MapNode;
1212
import org.seedstack.coffig.node.NamedNode;
1313
import org.seedstack.coffig.spi.ConfigurationProvider;
14+
import org.slf4j.Logger;
15+
import org.slf4j.LoggerFactory;
1416

1517
public class EnvironmentProvider implements ConfigurationProvider {
18+
private static final Logger LOGGER = LoggerFactory.getLogger(EnvironmentProvider.class);
19+
1620
@Override
1721
public MapNode provide() {
22+
LOGGER.debug("Reading configuration from environment variables");
1823
return new MapNode(System.getenv().entrySet().stream()
1924
.map(e -> new NamedNode(e.getKey(), e.getValue()))
2025
.toArray(NamedNode[]::new));

src/main/java/org/seedstack/coffig/provider/JacksonProvider.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@ public synchronized JacksonProvider addSource(URL url) {
9191
}
9292

9393
@Override
94-
public void fileChanged(Path changed) {
94+
public void fileChanged(Path path) {
95+
LOGGER.debug("Configuration file has changed: " + path);
9596
dirty.set(true);
9697
}
9798

9899
private MapNode buildTreeFromSource(URL url) {
99100
try {
101+
LOGGER.debug("Reading configuration from " + url.toExternalForm());
100102
return buildTreeFromFields(jacksonMapper.readTree(url));
101103
} catch (IOException e) {
102104
throw ConfigurationException.wrap(e, ConfigurationErrorCode.FAILED_TO_READ_CONFIGURATION)
@@ -111,7 +113,7 @@ private MapNode buildTreeFromFields(JsonNode node) {
111113
TreeNode treeNode = buildTreeFromField(entry.getValue());
112114
namedNodes.add(new NamedNode(name, treeNode));
113115
});
114-
return new MapNode(namedNodes.toArray(new NamedNode[namedNodes.size()]));
116+
return new MapNode(namedNodes.toArray(new NamedNode[0]));
115117
}
116118

117119
private TreeNode buildTreeFromField(JsonNode jsonNode) {
@@ -145,7 +147,7 @@ public TreeNode build(JsonNode jsonNode) {
145147
TreeNode treeNode = buildTreeFromField(jsonNode.get(i));
146148
treeNodes.add(treeNode);
147149
}
148-
TreeNode[] nodes = treeNodes.toArray(new TreeNode[treeNodes.size()]);
150+
TreeNode[] nodes = treeNodes.toArray(new TreeNode[0]);
149151
return new ArrayNode(nodes);
150152
}
151153
}
@@ -161,7 +163,7 @@ public TreeNode build(JsonNode jsonNode) {
161163
TreeNode treeNode = buildTreeFromField(entry.getValue());
162164
namedNodes.add(new NamedNode(fieldName, treeNode));
163165
}
164-
NamedNode[] nodes = namedNodes.toArray(new NamedNode[namedNodes.size()]);
166+
NamedNode[] nodes = namedNodes.toArray(new NamedNode[0]);
165167
return new MapNode(nodes);
166168
}
167169
}

src/main/java/org/seedstack/coffig/provider/PropertiesProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,12 @@ public synchronized PropertiesProvider addSource(URL url) {
8585

8686
@Override
8787
public void fileChanged(Path path) {
88+
LOGGER.debug("Configuration file has changed: " + path);
8889
dirty.set(true);
8990
}
9091

9192
private MapNode buildTreeFromSource(URL url) {
93+
LOGGER.debug("Reading configuration from " + url.toExternalForm());
9294
try (InputStream inputStream = url.openStream()) {
9395
MapNode mapNode = new MapNode();
9496
Properties properties = new Properties();

src/main/java/org/seedstack/coffig/provider/SystemPropertiesProvider.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111
import org.seedstack.coffig.node.MapNode;
1212
import org.seedstack.coffig.node.NamedNode;
1313
import org.seedstack.coffig.spi.ConfigurationProvider;
14+
import org.slf4j.Logger;
15+
import org.slf4j.LoggerFactory;
1416

1517
public class SystemPropertiesProvider implements ConfigurationProvider {
18+
private static final Logger LOGGER = LoggerFactory.getLogger(SystemPropertiesProvider.class);
19+
1620
@Override
1721
public MapNode provide() {
22+
LOGGER.debug("Reading configuration from system properties");
1823
return new MapNode(System.getProperties().entrySet().stream()
1924
.map(e -> new NamedNode((String) e.getKey(), (String) e.getValue()))
2025
.toArray(NamedNode[]::new));

0 commit comments

Comments
 (0)