[Git][java-team/libsejda-java][upstream] New upstream version 4.1.2
Markus Koschany
gitlab at salsa.debian.org
Mon Nov 9 12:23:24 GMT 2020
Markus Koschany pushed to branch upstream at Debian Java Maintainers / libsejda-java
Commits:
a32c03e4 by Markus Koschany at 2020-11-09T13:17:16+01:00
New upstream version 4.1.2
- - - - -
17 changed files:
- .github/workflows/maven.yml
- pom.xml
- sejda-conversion/pom.xml
- sejda-core/pom.xml
- sejda-distribution/pom.xml
- sejda-docs/pom.xml
- sejda-fonts/pom.xml
- sejda-image-writers/pom.xml
- sejda-model/pom.xml
- sejda-model/src/main/java/org/sejda/model/input/FileSource.java
- sejda-model/src/main/java/org/sejda/model/input/PdfFileSource.java
- sejda-model/src/main/java/org/sejda/model/input/PdfStreamSource.java
- sejda-model/src/main/java/org/sejda/model/input/PdfURLSource.java
- sejda-model/src/main/java/org/sejda/model/input/StreamSource.java
- sejda-model/src/test/java/org/sejda/TestUtils.java
- sejda-model/src/test/java/org/sejda/model/input/PdfFileSourceTest.java
- sejda-sambox/pom.xml
Changes:
=====================================
.github/workflows/maven.yml
=====================================
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: ['8', '11', '14', '15-ea']
+ java: ['8', '11', '14', '15', '16-ea']
name: JDK ${{ matrix.java }}
steps:
=====================================
pom.xml
=====================================
@@ -6,7 +6,7 @@
<artifactId>sejda-parent</artifactId>
<packaging>pom</packaging>
<name>sejda</name>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<description>An extendible and configurable PDF manipulation layer library. A ready to use java library to perform PDF documents manipulation without having to deal with the low level API. Sejda offers many "ready to go" manipulations implemented using the SAMBox but it can be extended to use other implementations.</description>
<organization>
@@ -32,7 +32,7 @@
<connection>scm:git:git at github.com:torakiki/sejda.git</connection>
<developerConnection>scm:git:git at github.com:torakiki/sejda.git</developerConnection>
<url>scm:git:git at github.com:torakiki/sejda.git</url>
- <tag>v4.1.1</tag>
+ <tag>v4.1.2</tag>
</scm>
<developers>
@@ -364,8 +364,8 @@
<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
<hamcrest.version>1.3</hamcrest.version>
<sambox.version>2.2.3</sambox.version>
- <sejda.io.version>2.1.1</sejda.io.version>
- <bouncycastle.version>1.64</bouncycastle.version>
+ <sejda.io.version>2.1.3</sejda.io.version>
+ <bouncycastle.version>1.66</bouncycastle.version>
<twelvemonkeys.version>3.4.2</twelvemonkeys.version>
<!-- so that build is not platform dependent via encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
=====================================
sejda-conversion/pom.xml
=====================================
@@ -10,7 +10,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
sejda-core/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
sejda-distribution/pom.xml
=====================================
@@ -10,7 +10,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
sejda-docs/pom.xml
=====================================
@@ -5,7 +5,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
sejda-fonts/pom.xml
=====================================
@@ -10,7 +10,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
sejda-image-writers/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
sejda-model/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
sejda-model/src/main/java/org/sejda/model/input/FileSource.java
=====================================
@@ -65,7 +65,8 @@ public class FileSource extends AbstractSource<File> {
return SeekableSources.seekableSourceFrom(file);
}
- return SeekableSources.onTempFileSeekableSourceFrom(getEncryptionAtRestPolicy().decrypt(new FileInputStream(file)));
+ return SeekableSources.onTempFileSeekableSourceFrom(
+ getEncryptionAtRestPolicy().decrypt(new FileInputStream(file)), file.getName());
}
public static FileSource newInstance(File file) {
=====================================
sejda-model/src/main/java/org/sejda/model/input/PdfFileSource.java
=====================================
@@ -63,7 +63,9 @@ public class PdfFileSource extends AbstractPdfSource<File> {
return SeekableSources.seekableSourceFrom(file);
}
- return SeekableSources.onTempFileSeekableSourceFrom(getEncryptionAtRestPolicy().decrypt(new FileInputStream(file)));
+ // passes a filename hint
+ return SeekableSources.onTempFileSeekableSourceFrom(
+ getEncryptionAtRestPolicy().decrypt(new FileInputStream(file)), file.getName());
}
/**
=====================================
sejda-model/src/main/java/org/sejda/model/input/PdfStreamSource.java
=====================================
@@ -56,7 +56,7 @@ public final class PdfStreamSource extends AbstractPdfSource<InputStream> {
@Override
public SeekableSource initializeSeekableSource() throws IOException {
- return SeekableSources.onTempFileSeekableSourceFrom(getEncryptionAtRestPolicy().decrypt(stream));
+ return SeekableSources.onTempFileSeekableSourceFrom(getEncryptionAtRestPolicy().decrypt(stream), getName());
}
/**
=====================================
sejda-model/src/main/java/org/sejda/model/input/PdfURLSource.java
=====================================
@@ -58,7 +58,8 @@ public final class PdfURLSource extends AbstractPdfSource<URL> {
@Override
public SeekableSource initializeSeekableSource() throws IOException {
- return SeekableSources.onTempFileSeekableSourceFrom(getEncryptionAtRestPolicy().decrypt(url.openStream()));
+ return SeekableSources.onTempFileSeekableSourceFrom(
+ getEncryptionAtRestPolicy().decrypt(url.openStream()), getName());
}
@Override
=====================================
sejda-model/src/main/java/org/sejda/model/input/StreamSource.java
=====================================
@@ -54,7 +54,7 @@ public class StreamSource extends AbstractSource<InputStream> {
@Override
public SeekableSource initializeSeekableSource() throws IOException {
- return SeekableSources.onTempFileSeekableSourceFrom(getEncryptionAtRestPolicy().decrypt(stream));
+ return SeekableSources.onTempFileSeekableSourceFrom(getEncryptionAtRestPolicy().decrypt(stream), getName());
}
public static StreamSource newInstance(InputStream stream, String name) {
=====================================
sejda-model/src/test/java/org/sejda/TestUtils.java
=====================================
@@ -26,10 +26,7 @@ import org.sejda.core.encryption.EncryptionHelpers;
import org.sejda.model.encryption.CipherBasedEncryptionAtRest;
import org.sejda.model.encryption.CipherSupplier;
import org.sejda.model.encryption.EncryptionAtRestPolicy;
-import org.sejda.model.input.FileSource;
-import org.sejda.model.input.PdfFileSource;
-import org.sejda.model.input.PdfStreamSource;
-import org.sejda.model.input.StreamSource;
+import org.sejda.model.input.*;
import org.sejda.model.parameter.base.TaskParameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -168,9 +165,13 @@ public final class TestUtils {
});
}
- private static File encryptedAtRest(InputStream in) {
+ private static File encryptedAtRestFile(TaskSource source) throws IOException {
+ return encryptedAtRest(source.getSeekableSource().asNewInputStream(), source.getName());
+ }
+
+ private static File encryptedAtRest(InputStream in, String name) {
try {
- File file = org.sejda.core.support.io.IOUtils.createTemporaryBuffer();
+ File file = org.sejda.core.support.io.IOUtils.createTemporaryBufferWithName(name);
OutputStream out = getEncryptionAtRestPolicy().encrypt(new FileOutputStream(file));
IOUtils.copy(in, out);
IOUtils.closeQuietly(out);
@@ -183,21 +184,21 @@ public final class TestUtils {
}
public static StreamSource encryptedAtRest(StreamSource source) throws IOException {
- File file = encryptedAtRest(source.getSeekableSource().asNewInputStream());
+ File file = encryptedAtRestFile(source);
StreamSource result = StreamSource.newInstance(new FileInputStream(file), source.getName());
result.setEncryptionAtRestPolicy(getEncryptionAtRestPolicy());
return result;
}
public static FileSource encryptedAtRest(FileSource source) throws IOException {
- File file = encryptedAtRest(source.getSeekableSource().asNewInputStream());
+ File file = encryptedAtRest(source.getSeekableSource().asNewInputStream(), source.getName());
FileSource result = FileSource.newInstance(file);
result.setEncryptionAtRestPolicy(getEncryptionAtRestPolicy());
return result;
}
public static PdfStreamSource encryptedAtRest(PdfStreamSource source) throws IOException {
- File file = encryptedAtRest(source.getSeekableSource().asNewInputStream());
+ File file = encryptedAtRestFile(source);
PdfStreamSource result = PdfStreamSource.newInstanceWithPassword(new FileInputStream(file), source.getName(),
source.getPassword());
result.setEncryptionAtRestPolicy(getEncryptionAtRestPolicy());
@@ -205,7 +206,7 @@ public final class TestUtils {
}
public static PdfFileSource encryptedAtRest(PdfFileSource source) throws IOException {
- File file = encryptedAtRest(source.getSeekableSource().asNewInputStream());
+ File file = encryptedAtRestFile(source);
PdfFileSource result = PdfFileSource.newInstanceWithPassword(file, source.getPassword());
result.setEncryptionAtRestPolicy(getEncryptionAtRestPolicy());
return result;
=====================================
sejda-model/src/test/java/org/sejda/model/input/PdfFileSourceTest.java
=====================================
@@ -19,11 +19,15 @@
*/
package org.sejda.model.input;
+import static org.hamcrest.core.StringEndsWith.endsWith;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.sejda.TestUtils.encryptedAtRest;
import java.io.File;
+import java.io.IOException;
import org.junit.Test;
import org.sejda.model.exception.TaskIOException;
@@ -65,4 +69,21 @@ public class PdfFileSourceTest {
instance.open(opener);
verify(opener).open(instance);
}
+
+ @Test
+ public void encryptedAtRestKeepsOriginalFilename_stream() throws IOException {
+ PdfStreamSource source = encryptedAtRest(
+ PdfStreamSource.newInstanceNoPassword(
+ this.getClass().getClassLoader().getResourceAsStream("pdf/test_file.pdf"), "test_file.pdf"));
+
+ assertThat(source.getSeekableSource().id(), endsWith("test_file.pdf"));
+ }
+
+ @Test
+ public void encryptedAtRestKeepsOriginalFilename_file() throws IOException {
+ File fileSource = new File(this.getClass().getClassLoader().getResource("pdf/test_file.pdf").getFile());
+ PdfFileSource source = encryptedAtRest(PdfFileSource.newInstanceNoPassword(fileSource));
+
+ assertThat(source.getSeekableSource().id(), endsWith("test_file.pdf"));
+ }
}
=====================================
sejda-sambox/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>org.sejda</groupId>
<artifactId>sejda-parent</artifactId>
- <version>4.1.1</version>
+ <version>4.1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
View it on GitLab: https://salsa.debian.org/java-team/libsejda-java/-/commit/a32c03e4c2fcbb45fa3e632a5936b212fe63db77
--
View it on GitLab: https://salsa.debian.org/java-team/libsejda-java/-/commit/a32c03e4c2fcbb45fa3e632a5936b212fe63db77
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201109/32a3f3c8/attachment.html>
More information about the pkg-java-commits
mailing list