Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ErrorProne errors #3623

Merged
merged 20 commits into from
Jan 10, 2018
Merged

Fix ErrorProne errors #3623

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1367e19
Explicitly set jacoco version
LinusDietz Jan 8, 2018
8a5578d
Merge remote-tracking branch 'origin/master'
LinusDietz Jan 9, 2018
7c8edce
This fixes the error prone errors
koppor Jan 9, 2018
bb9406f
Merge remote-tracking branch 'origin/master'
LinusDietz Jan 9, 2018
915c7ec
Fix RegExpBasedFileFinder
LinusDietz Jan 9, 2018
b48a6db
Fix FileUtil
LinusDietz Jan 9, 2018
b396517
Fix LocalizationParser
LinusDietz Jan 9, 2018
1ca53a0
Fix PropertiesLocaleCompletenessTest
LinusDietz Jan 9, 2018
fd7b04e
Fix ArchitectureTests
LinusDietz Jan 9, 2018
81b5511
Fix TestIconsProperties
LinusDietz Jan 9, 2018
9dcfee0
Merge branch 'master' into buildfix
LinusDietz Jan 9, 2018
5dc2bc3
Merge branch 'master' of https://github.com/JabRef/jabref into buildfix
LinusDietz Jan 9, 2018
cc4df3b
Fix CiteKeyBasedFileFinder
LinusDietz Jan 9, 2018
e12311f
Addition to Merge
LinusDietz Jan 9, 2018
00691b6
Revert "Addition to Merge"
LinusDietz Jan 9, 2018
63d03e5
Don't return empty lists
LinusDietz Jan 9, 2018
c8dce57
Fix bug
LinusDietz Jan 9, 2018
14d07d2
Test are green
LinusDietz Jan 9, 2018
f005832
Checkstyle is green
LinusDietz Jan 9, 2018
c93ae63
Catch UncheckedIOExceptions
LinusDietz Jan 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Optional;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
Expand Down Expand Up @@ -153,8 +154,10 @@ public static List<CitationStyle> discoverCitationStyles() {

try (FileSystem jarFs = FileSystems.newFileSystem(Paths.get(path), null)) {

List<Path> allStyles = Files.find(jarFs.getRootDirectories().iterator().next(), 1, (file, attr) -> file.toString().endsWith("csl")).collect(Collectors.toList());

List<Path> allStyles;
try (Stream<Path> stylefileStream = Files.find(jarFs.getRootDirectories().iterator().next(), 1, (file, attr) -> file.toString().endsWith("csl"))) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is again one of the ugly cases where an unchecked exception could be thrown. Because streams and lambdas can't throw checked exceptions. In this case it could be that the stream is already closed when calling collect.
Similar to #3606

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please catch IOUncheckedException and rethrow it as IOException.

allStyles = stylefileStream.collect(Collectors.toList());
}
for (Path style : allStyles) {
CitationStyle.createCitationStyleFromFile(style.getFileName().toString())
.ifPresent(STYLES::add);
Expand Down