You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2017/09/25 15:10:40 UTC
svn commit: r1809636 - in /poi/trunk/src:
examples/src/org/apache/poi/xssf/usermodel/examples/
ooxml/java/org/apache/poi/xssf/streaming/
ooxml/java/org/apache/poi/xssf/usermodel/
ooxml/java/org/apache/poi/xwpf/usermodel/ ooxml/testcases/org/apache/poi/...
Author: centic
Date: Mon Sep 25 15:10:40 2017
New Revision: 1809636
URL: http://svn.apache.org/viewvc?rev=1809636&view=rev
Log:
Fix some Sonar issues
Modified:
poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
Modified: poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java?rev=1809636&r1=1809635&r2=1809636&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/BigGridDemo.java Mon Sep 25 15:10:40 2017
@@ -94,15 +94,15 @@ public class BigGridDemo {
String sheetRef = sheet.getPackagePart().getPartName().getName();
//save the template
- FileOutputStream os = new FileOutputStream("template.xlsx");
- wb.write(os);
- os.close();
+ try (FileOutputStream os = new FileOutputStream("template.xlsx")) {
+ wb.write(os);
+ }
//Step 2. Generate XML file.
File tmp = File.createTempFile("sheet", ".xml");
- Writer fw = new OutputStreamWriter(new FileOutputStream(tmp), XML_ENCODING);
- generate(fw, styles);
- fw.close();
+ try (Writer fw = new OutputStreamWriter(new FileOutputStream(tmp), XML_ENCODING)) {
+ generate(fw, styles);
+ }
//Step 3. Substitute the template entry with the generated data
try (FileOutputStream out = new FileOutputStream("big-grid.xlsx")) {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java?rev=1809636&r1=1809635&r2=1809636&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java Mon Sep 25 15:10:40 2017
@@ -140,8 +140,8 @@ public class SXSSFWorkbook implements Wo
* <ul>
* <li>
* Access initial cells and rows in the template. After constructing
- * {@link #SXSSFWorkbook(XSSFWorkbook)} all internal windows are empty and
- * {@link SXSSFSheet#getRow} and {@link SXSSFRow#getCell} return <code>null</code>.
+ * all internal windows are empty and {@link SXSSFSheet#getRow} and
+ * {@link SXSSFRow#getCell} return <code>null</code>.
* </li>
* <li>
* Override existing cells and rows. The API silently allows that but
@@ -369,30 +369,24 @@ public class SXSSFWorkbook implements Wo
protected void injectData(ZipEntrySource zipEntrySource, OutputStream out) throws IOException {
try {
- ZipOutputStream zos = new ZipOutputStream(out);
- try {
+ try (ZipOutputStream zos = new ZipOutputStream(out)) {
Enumeration<? extends ZipEntry> en = zipEntrySource.getEntries();
while (en.hasMoreElements()) {
ZipEntry ze = en.nextElement();
zos.putNextEntry(new ZipEntry(ze.getName()));
InputStream is = zipEntrySource.getInputStream(ze);
- XSSFSheet xSheet=getSheetFromZipEntryName(ze.getName());
+ XSSFSheet xSheet = getSheetFromZipEntryName(ze.getName());
// See bug 56557, we should not inject data into the special ChartSheets
- if(xSheet!=null && !(xSheet instanceof XSSFChartSheet)) {
- SXSSFSheet sxSheet=getSXSSFSheet(xSheet);
- InputStream xis = sxSheet.getWorksheetXMLInputStream();
- try {
- copyStreamAndInjectWorksheet(is,zos,xis);
- } finally {
- xis.close();
+ if (xSheet != null && !(xSheet instanceof XSSFChartSheet)) {
+ SXSSFSheet sxSheet = getSXSSFSheet(xSheet);
+ try (InputStream xis = sxSheet.getWorksheetXMLInputStream()) {
+ copyStreamAndInjectWorksheet(is, zos, xis);
}
} else {
IOUtils.copy(is, zos);
}
is.close();
}
- } finally {
- zos.close();
}
} finally {
zipEntrySource.close();
@@ -918,11 +912,8 @@ public class SXSSFWorkbook implements Wo
File tmplFile = TempFile.createTempFile("poi-sxssf-template", ".xlsx");
boolean deleted;
try {
- FileOutputStream os = new FileOutputStream(tmplFile);
- try {
+ try (FileOutputStream os = new FileOutputStream(tmplFile)) {
_wb.write(os);
- } finally {
- os.close();
}
//Substitute the template entries with the generated sheet data files
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1809636&r1=1809635&r2=1809636&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Mon Sep 25 15:10:40 2017
@@ -482,7 +482,7 @@ public class XSSFWorkbook extends POIXML
*/
protected static OPCPackage newPackage(XSSFWorkbookType workbookType) {
try {
- OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream());
+ OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream()); // NOSONAR - we do not want to close this here
// Main part
PackagePartName corePartName = PackagingURIHelper.createPartName(XSSFRelation.WORKBOOK.getDefaultFileName());
// Create main part relationship
@@ -2361,7 +2361,7 @@ public class XSSFWorkbook extends POIXML
@Override
public int addOlePackage(byte[] oleData, String label, String fileName, String command)
- throws IOException {
+ throws IOException {
// find an unused part name
OPCPackage opc = getPackage();
PackagePartName pnOLE;
@@ -2381,17 +2381,17 @@ public class XSSFWorkbook extends POIXML
ByteArrayOutputStream bos = new ByteArrayOutputStream(oleData.length+500);
ole10.writeOut(bos);
- POIFSFileSystem poifs = new POIFSFileSystem();
- DirectoryNode root = poifs.getRoot();
- root.createDocument(Ole10Native.OLE10_NATIVE, new ByteArrayInputStream(bos.toByteArray()));
- root.setStorageClsid(ClassID.OLE10_PACKAGE);
-
- // TODO: generate CombObj stream
-
- OutputStream os = pp.getOutputStream();
- poifs.writeFilesystem(os);
- os.close();
- poifs.close();
+ try (POIFSFileSystem poifs = new POIFSFileSystem()) {
+ DirectoryNode root = poifs.getRoot();
+ root.createDocument(Ole10Native.OLE10_NATIVE, new ByteArrayInputStream(bos.toByteArray()));
+ root.setStorageClsid(ClassID.OLE10_PACKAGE);
+
+ // TODO: generate CombObj stream
+
+ try (OutputStream os = pp.getOutputStream()) {
+ poifs.writeFilesystem(os);
+ }
+ }
return oleId;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1809636&r1=1809635&r2=1809636&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java Mon Sep 25 15:10:40 2017
@@ -129,7 +129,7 @@ public class XWPFDocument extends POIXML
*/
protected static OPCPackage newPackage() {
try {
- OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream());
+ OPCPackage pkg = OPCPackage.create(new ByteArrayOutputStream()); // NOSONAR - we do not want to close this here
// Main part
PackagePartName corePartName = PackagingURIHelper.createPartName(XWPFRelation.DOCUMENT.getDefaultFileName());
// Create main part relationship
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java?rev=1809636&r1=1809635&r2=1809636&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java Mon Sep 25 15:10:40 2017
@@ -203,9 +203,9 @@ public class TestXSSFBReader {
@Override
public void headerFooter(String text, boolean isHeader, String tagName) {
if (isHeader) {
- sb.append("<header tagName=\"" + tagName + "\">" + text + "</header>");
+ sb.append("<header tagName=\"").append(tagName).append("\">").append(text).append("</header>");
} else {
- sb.append("<footer tagName=\"" + tagName + "\">" + text + "</footer>");
+ sb.append("<footer tagName=\"").append(tagName).append("\">").append(text).append("</footer>");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org