You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/09/19 17:08:22 UTC
svn commit: r1881853 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox:
pdfparser/COSParser.java pdfwriter/COSWriter.java pdmodel/PDDocument.java
pdmodel/encryption/PDEncryption.java
pdmodel/encryption/SecurityHandlerFactory.java
Author: tilman
Date: Sat Sep 19 17:08:22 2020
New Revision: 1881853
URL: http://svn.apache.org/viewvc?rev=1881853&view=rev
Log:
PDFBOX-4421: Sonar fix: provide the parametrized type
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1881853&r1=1881852&r2=1881853&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Sat Sep 19 17:08:22 2020
@@ -50,6 +50,7 @@ import org.apache.pdfbox.pdmodel.encrypt
import org.apache.pdfbox.pdmodel.encryption.DecryptionMaterial;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
import org.apache.pdfbox.pdmodel.encryption.PDEncryption;
+import org.apache.pdfbox.pdmodel.encryption.ProtectionPolicy;
import org.apache.pdfbox.pdmodel.encryption.PublicKeyDecryptionMaterial;
import org.apache.pdfbox.pdmodel.encryption.SecurityHandler;
import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
@@ -142,7 +143,7 @@ public class COSParser extends BaseParse
/**
* The security handler.
*/
- protected SecurityHandler securityHandler = null;
+ protected SecurityHandler<? extends ProtectionPolicy> securityHandler = null;
/**
* how many trailing bytes to read for EOF marker.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1881853&r1=1881852&r2=1881853&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Sat Sep 19 17:08:22 2020
@@ -62,6 +62,7 @@ import org.apache.pdfbox.io.RandomAccess
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.pdfparser.PDFXRefStream;
import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.encryption.ProtectionPolicy;
import org.apache.pdfbox.pdmodel.encryption.SecurityHandler;
import org.apache.pdfbox.pdmodel.fdf.FDFDocument;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.COSFilterInputStream;
@@ -1342,7 +1343,8 @@ public class COSWriter implements ICOSVi
{
if (!incrementalUpdate)
{
- SecurityHandler securityHandler = pdDocument.getEncryption().getSecurityHandler();
+ SecurityHandler<? extends ProtectionPolicy> securityHandler =
+ pdDocument.getEncryption().getSecurityHandler();
if (!securityHandler.hasProtectionPolicy())
{
throw new IllegalStateException("PDF contains an encryption dictionary, please remove it with "
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java?rev=1881853&r1=1881852&r2=1881853&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java Sat Sep 19 17:08:22 2020
@@ -1166,7 +1166,8 @@ public class PDDocument implements Close
encryption = new PDEncryption();
}
- SecurityHandler securityHandler = SecurityHandlerFactory.INSTANCE.newSecurityHandlerForPolicy(policy);
+ SecurityHandler<? extends ProtectionPolicy> securityHandler =
+ SecurityHandlerFactory.INSTANCE.newSecurityHandlerForPolicy(policy);
if (securityHandler == null)
{
throw new IOException("No security handler for policy " + policy);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java?rev=1881853&r1=1881852&r2=1881853&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java Sat Sep 19 17:08:22 2020
@@ -77,7 +77,7 @@ public class PDEncryption implements COS
public static final int DEFAULT_VERSION = VERSION0_UNDOCUMENTED_UNSUPPORTED;
private final COSDictionary dictionary;
- private SecurityHandler securityHandler;
+ private SecurityHandler<? extends ProtectionPolicy> securityHandler;
/**
* creates a new empty encryption dictionary.
@@ -102,7 +102,7 @@ public class PDEncryption implements COS
* @return a security handler instance
* @throws IOException if there is no security handler available which matches the Filter
*/
- public SecurityHandler getSecurityHandler() throws IOException
+ public SecurityHandler<? extends ProtectionPolicy> getSecurityHandler() throws IOException
{
if (securityHandler == null)
{
@@ -115,7 +115,7 @@ public class PDEncryption implements COS
* Sets the security handler used in this encryption dictionary
* @param securityHandler new security handler
*/
- public void setSecurityHandler(SecurityHandler securityHandler)
+ public void setSecurityHandler(SecurityHandler<? extends ProtectionPolicy> securityHandler)
{
this.securityHandler = securityHandler;
// TODO set Filter (currently this is done by the security handlers)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java?rev=1881853&r1=1881852&r2=1881853&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java Sat Sep 19 17:08:22 2020
@@ -81,7 +81,7 @@ public final class SecurityHandlerFactor
* @param policy the protection policy for which to create a security handler
* @return a new SecurityHandler instance, or null if none is available
*/
- public SecurityHandler newSecurityHandlerForPolicy(ProtectionPolicy policy)
+ public SecurityHandler<? extends ProtectionPolicy> newSecurityHandlerForPolicy(ProtectionPolicy policy)
{
Class<? extends SecurityHandler> handlerClass = policyToHandler.get(policy.getClass());
if (handlerClass == null)
@@ -99,7 +99,7 @@ public final class SecurityHandlerFactor
* @param name the Filter name from the PDF encryption dictionary
* @return a new SecurityHandler instance, or null if none is available
*/
- public SecurityHandler newSecurityHandlerForFilter(String name)
+ public SecurityHandler<? extends ProtectionPolicy> newSecurityHandlerForFilter(String name)
{
Class<? extends SecurityHandler> handlerClass = nameToHandler.get(name);
if (handlerClass == null)
@@ -119,7 +119,7 @@ public final class SecurityHandlerFactor
* @param args array of objects to be passed as arguments to the constructor call.
* @return a new SecurityHandler instance, or null if none is available.
*/
- private SecurityHandler newSecurityHandler(Class<? extends SecurityHandler> handlerClass,
+ private SecurityHandler<? extends ProtectionPolicy> newSecurityHandler(Class<? extends SecurityHandler> handlerClass,
Class<?>[] argsClasses, Object[] args)
{
try