aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-07-22 23:27:12 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-07-23 10:18:17 +0200
commitbc7d7e83a24b7cd42f7060a0472b76094cf69f45 (patch)
tree007f3ac960a1516e2c0429d9c89934938c819f76 /server/sonar-server/src
parenta6a852b3d4cd872070216a0aed34e1df48dc175c (diff)
downloadsonarqube-bc7d7e83a24b7cd42f7060a0472b76094cf69f45.tar.gz
sonarqube-bc7d7e83a24b7cd42f7060a0472b76094cf69f45.zip
SONAR-6684 remove unused measure fields from report
Diffstat (limited to 'server/sonar-server/src')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java28
1 files changed, 2 insertions, 26 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java
index 775d500d595..68796705733 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/batch/BatchReportReaderImpl.java
@@ -26,7 +26,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.util.List;
import java.util.NoSuchElementException;
import javax.annotation.CheckForNull;
import org.apache.commons.io.FileUtils;
@@ -89,36 +88,13 @@ public class BatchReportReaderImpl implements BatchReportReader {
}
@Override
- @CheckForNull
public CloseableIterator<BatchReport.SyntaxHighlighting> readComponentSyntaxHighlighting(int fileRef) {
- File file = delegate.readComponentSyntaxHighlighting(fileRef);
- if (file == null) {
- return CloseableIterator.emptyCloseableIterator();
- }
-
- try {
- return new ParserCloseableIterator<>(BatchReport.SyntaxHighlighting.PARSER, FileUtils.openInputStream(file));
- } catch (IOException e) {
- Throwables.propagate(e);
- // actually never reached
- return CloseableIterator.emptyCloseableIterator();
- }
+ return delegate.readComponentSyntaxHighlighting(fileRef);
}
@Override
public CloseableIterator<BatchReport.Coverage> readComponentCoverage(int fileRef) {
- File file = delegate.readComponentCoverage(fileRef);
- if (file == null) {
- return CloseableIterator.emptyCloseableIterator();
- }
-
- try {
- return new ParserCloseableIterator<>(BatchReport.Coverage.PARSER, FileUtils.openInputStream(file));
- } catch (IOException e) {
- Throwables.propagate(e);
- // actually never reached
- return CloseableIterator.emptyCloseableIterator();
- }
+ return delegate.readComponentCoverage(fileRef);
}
@Override