Skip to content

Commit 2113ff8

Browse files
committed
simplify env.properties utf-8 handling
1 parent 3a7841a commit 2113ff8

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

allure-generator/src/main/java/io/qameta/allure/allure1/Allure1Plugin.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import java.io.InputStreamReader;
5151
import java.io.PushbackReader;
5252
import java.math.BigInteger;
53-
import java.nio.charset.CharacterCodingException;
5453
import java.nio.charset.CharsetDecoder;
5554
import java.nio.charset.CodingErrorAction;
5655
import java.nio.file.Files;
@@ -567,8 +566,8 @@ private Map<String, String> readEnvironmentPropertiesUtf8(final Path envPropsFil
567566
}
568567

569568
propertiesToMap(utf8Items).load(pushbackReader);
569+
return utf8Items;
570570
}
571-
return utf8Items;
572571
}
573572

574573
private Map<String, String> processEnvironmentProperties(final Path directory) {
@@ -578,15 +577,6 @@ private Map<String, String> processEnvironmentProperties(final Path directory) {
578577
}
579578
try {
580579
return readEnvironmentPropertiesUtf8(envPropsFile);
581-
} catch (CharacterCodingException e) {
582-
LOGGER.error("Failed to read {} as UTF-8, falling back to ISO-8859-1", envPropsFile, e);
583-
final Map<String, String> items = new LinkedHashMap<>();
584-
try (InputStream inputStream = Files.newInputStream(envPropsFile)) {
585-
propertiesToMap(items).load(inputStream);
586-
} catch (IOException ex) {
587-
LOGGER.error("Could not read environment.properties file {}", envPropsFile, ex);
588-
}
589-
return items;
590580
} catch (IOException e) {
591581
LOGGER.error("Could not read environment.properties file {}", envPropsFile, e);
592582
return new LinkedHashMap<>();

0 commit comments

Comments
 (0)