* @param newDirectory the new directory
*/
@Internal
- protected void replaceDirectory(DirectoryNode newDirectory) {
+ protected void replaceDirectory(DirectoryNode newDirectory) throws IOException {
+ if (
+ // do not close if it is actually the same directory or
+ newDirectory == directory ||
+
+ // also for different directories, but same FileSystem
+ (newDirectory != null && directory != null && newDirectory.getFileSystem() == directory.getFileSystem())) {
+ return;
+ }
+
+ // close any previous opened DataSource
+ if (directory != null && directory.getFileSystem() != null) {
+ directory.getFileSystem().close();
+ }
+
directory = newDirectory;
}
private byte[] buffer;
private long size;
-
+
public ByteArrayBackedDataSource(byte[] data, int size) { // NOSONAR
this.buffer = data;
this.size = size;
}
+
public ByteArrayBackedDataSource(byte[] data) {
this(data, data.length);
}
-
+
@Override
public ByteBuffer read(int length, long position) {
if(position >= size) {
position + " in stream of length " + size
);
}
-
+
int toRead = (int)Math.min(length, size - position);
return ByteBuffer.wrap(buffer, (int)position, toRead);
}
-
+
@Override
public void write(ByteBuffer src, long position) {
// Extend if needed
- long endPosition = position + src.capacity();
+ long endPosition = position + src.capacity();
if(endPosition > buffer.length) {
extend(endPosition);
}
-
+
// Now copy
src.get(buffer, (int)position, src.capacity());
-
+
// Update size if needed
if(endPosition > size) {
size = endPosition;
}
}
-
+
private void extend(long length) {
// Consider extending by a bit more than requested
long difference = length - buffer.length;
System.arraycopy(buffer, 0, nb, 0, (int)size);
buffer = nb;
}
-
+
@Override
public void copyTo(OutputStream stream) throws IOException {
stream.write(buffer, 0, (int)size);
}
-
+
@Override
public long size() {
return size;
}
-
+
@Override
public void close() {
buffer = null;
private final boolean writable;
// remember file base, which needs to be closed too
- private RandomAccessFile srcFile;
+ private final RandomAccessFile srcFile;
// Buffers which map to a file-portion are not closed automatically when the Channel is closed
// therefore we need to keep the list of mapped buffers and do some ugly reflection to try to
}
public FileBackedDataSource(RandomAccessFile srcFile, boolean readOnly) {
- this(srcFile.getChannel(), readOnly);
- this.srcFile = srcFile;
+ this(srcFile, srcFile.getChannel(), readOnly);
}
public FileBackedDataSource(FileChannel channel, boolean readOnly) {
+ this(null, channel, readOnly);
+ }
+
+ private FileBackedDataSource(RandomAccessFile srcFile, FileChannel channel, boolean readOnly) {
+ this.srcFile = srcFile;
this.channel = channel;
this.writable = !readOnly;
}
fail("Shouldn't be able to open with the wrong password");
} catch (EncryptedDocumentException e) {
// expected here
+ } finally {
+ wb.close();
}
try {
import org.apache.poi.ss.util.CellReference;
import org.junit.Test;
-import java.util.Collections;
-import java.util.stream.Collectors;
+import java.io.IOException;
import java.util.stream.IntStream;
public class TestXSSFDataValidationConstraint {
// FIXME: whitespace wasn't stripped
assertEquals(literal, constraint.getFormula1());
}
-
+
@Test
public void listLiteralsQuotesAreStripped_arrayConstructor() {
// literal list, using array constructor
String[] literal = IntStream.range(0, 129).mapToObj(i -> "a").toArray(String[]::new);
assertThrows(IllegalArgumentException.class, () -> new XSSFDataValidationConstraint(literal));
}
-
+
@Test
- public void dataValidationListLiteralTooLongFromFile() {
- XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("DataValidationListTooLong.xlsx");
- XSSFFormulaEvaluator fEval = wb.getCreationHelper().createFormulaEvaluator();
- DataValidationEvaluator dvEval = new DataValidationEvaluator(wb, fEval);
- assertThrows(IllegalArgumentException.class, () -> dvEval.getValidationValuesForCell(new CellReference("Sheet0!A1")));
+ public void dataValidationListLiteralTooLongFromFile() throws IOException {
+ try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("DataValidationListTooLong.xlsx")) {
+ XSSFFormulaEvaluator fEval = wb.getCreationHelper().createFormulaEvaluator();
+ DataValidationEvaluator dvEval = new DataValidationEvaluator(wb, fEval);
+ assertThrows(IllegalArgumentException.class, () -> dvEval.getValidationValuesForCell(new CellReference("Sheet0!A1")));
+ }
}
@Test
assertNull(constraint.getExplicitListValues());
assertEquals("A1:A5", constraint.getFormula1());
}
-
+
@Test
public void namedRangeReference() {
// named range list
assertEquals("MyNamedRange", constraint.getFormula1());
}
-}
+}
}
@Override
- protected void replaceDirectory(DirectoryNode newDirectory) {
+ protected void replaceDirectory(DirectoryNode newDirectory) throws IOException {
getSlideShowImpl().replaceDirectoryImpl(newDirectory);
}
return super.initDirectory();
}
- void replaceDirectoryImpl(DirectoryNode newDirectory) {
+ void replaceDirectoryImpl(DirectoryNode newDirectory) throws IOException {
super.replaceDirectory(newDirectory);
}
* Tests bugs for POIFSFileSystem
*/
public final class TestFileSystemBugs {
- private static POIDataSamples _samples = POIDataSamples.getPOIFSInstance();
- private static POIDataSamples _ssSamples = POIDataSamples.getSpreadSheetInstance();
+ private static final POIDataSamples _samples = POIDataSamples.getPOIFSInstance();
+ private static final POIDataSamples _ssSamples = POIDataSamples.getSpreadSheetInstance();
private List<POIFSFileSystem> openedFSs;
assertTrue(entry.isDocumentEntry());
assertEquals("\u0001CompObj", entry.getName());
}
-
+
/**
* Ensure that a file with a corrupted property in the
* properties table can still be loaded, and the remaining
DirectoryNode root = openSample("unknown_properties.msg");
assertEquals(42, root.getEntryCount());
}
-
+
/**
* With heavily nested documents, ensure we still re-write the same
*/
projects / poi.git / commitdiff