honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix java 8 compile for Files.readString usage

This commit is contained in:
Ryan Ernst 2019-11-27 16:16:56 -08:00
parent 7802b60a5a
commit b236076f88
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/os/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java
View File

@ -36,6 +36,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
@ -58,8 +59,9 @@ public class ServerUtils {
if (installation.distribution.packaging != Distribution.Packaging.DOCKER) { if (installation.distribution.packaging != Distribution.Packaging.DOCKER) {
Path configFilePath = installation.config("elasticsearch.yml"); Path configFilePath = installation.config("elasticsearch.yml");
// this is fragile, but currently doesn't deviate from a single line enablement and not worth the parsing effort // this is fragile, but currently doesn't deviate from a single line enablement and not worth the parsing effort
String configFile = Files.readString(configFilePath, StandardCharsets.UTF_8); try (Stream<String> lines = Files.lines(configFilePath, StandardCharsets.UTF_8)) {
securityEnabled = configFile.contains(SECURITY_ENABLED); securityEnabled = lines.anyMatch(line -> line.contains(SECURITY_ENABLED));
}
} }
if (securityEnabled) { if (securityEnabled) {