Skip to content

Commit 1cf18a4

Browse files
joemoore13mohsinh
authored andcommitted
DATAES-237 - path-configuration fails to load configs from inside jars
1 parent 6535caf commit 1cf18a4

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717

1818
import static org.elasticsearch.node.NodeBuilder.*;
1919

20-
import java.io.IOException;
21-
import java.nio.file.Paths;
22-
20+
import java.io.InputStream;
2321
import org.apache.commons.lang.StringUtils;
2422
import org.elasticsearch.client.Client;
2523
import org.elasticsearch.client.node.NodeClient;
@@ -29,7 +27,6 @@
2927
import org.springframework.beans.factory.DisposableBean;
3028
import org.springframework.beans.factory.FactoryBean;
3129
import org.springframework.beans.factory.InitializingBean;
32-
import org.springframework.core.io.ClassPathResource;
3330

3431
/**
3532
* NodeClientFactoryBean
@@ -83,11 +80,11 @@ public void afterPropertiesSet() throws Exception {
8380

8481
private Settings loadConfig() {
8582
if (StringUtils.isNotBlank(pathConfiguration)) {
86-
try {
87-
return Settings.builder().loadFromPath(Paths.get(new ClassPathResource(pathConfiguration).getURI())).build();
88-
} catch (IOException e) {
89-
logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration), e);
83+
InputStream stream = getClass().getClassLoader().getResourceAsStream(pathConfiguration);
84+
if (stream != null) {
85+
return Settings.builder().loadFromStream(pathConfiguration, getClass().getClassLoader().getResourceAsStream(pathConfiguration)).build();
9086
}
87+
logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration));
9188
}
9289
return Settings.builder().build();
9390
}

0 commit comments

Comments
 (0)