PDFBOX-4421: Sonar fix: remove usage of generic wildcard type
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1881856 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
index 53941e9..6f5299e 100644
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
@@ -1166,7 +1166,7 @@
encryption = new PDEncryption();
}
- SecurityHandler<? extends ProtectionPolicy> securityHandler =
+ SecurityHandler<ProtectionPolicy> securityHandler =
SecurityHandlerFactory.INSTANCE.newSecurityHandlerForPolicy(policy);
if (securityHandler == null)
{
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
index 90ab560..7d84443 100644
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PDEncryption.java
@@ -77,7 +77,7 @@
public static final int DEFAULT_VERSION = VERSION0_UNDOCUMENTED_UNSUPPORTED;
private final COSDictionary dictionary;
- private SecurityHandler<? extends ProtectionPolicy> securityHandler;
+ private SecurityHandler<ProtectionPolicy> securityHandler;
/**
* creates a new empty encryption dictionary.
@@ -102,7 +102,7 @@
* @return a security handler instance
* @throws IOException if there is no security handler available which matches the Filter
*/
- public SecurityHandler<? extends ProtectionPolicy> getSecurityHandler() throws IOException
+ public SecurityHandler<ProtectionPolicy> getSecurityHandler() throws IOException
{
if (securityHandler == null)
{
@@ -115,7 +115,7 @@
* Sets the security handler used in this encryption dictionary
* @param securityHandler new security handler
*/
- public void setSecurityHandler(SecurityHandler<? extends ProtectionPolicy> securityHandler)
+ public void setSecurityHandler(SecurityHandler<ProtectionPolicy> securityHandler)
{
this.securityHandler = securityHandler;
// TODO set Filter (currently this is done by the security handlers)
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java
index f1367ec..8645024 100644
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandlerFactory.java
@@ -81,7 +81,7 @@
* @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<? extends ProtectionPolicy> newSecurityHandlerForPolicy(ProtectionPolicy policy)
+ public SecurityHandler<ProtectionPolicy> newSecurityHandlerForPolicy(ProtectionPolicy policy)
{
Class<? extends SecurityHandler> handlerClass = policyToHandler.get(policy.getClass());
if (handlerClass == null)
@@ -99,7 +99,7 @@
* @param name the Filter name from the PDF encryption dictionary
* @return a new SecurityHandler instance, or null if none is available
*/
- public SecurityHandler<? extends ProtectionPolicy> newSecurityHandlerForFilter(String name)
+ public SecurityHandler<ProtectionPolicy> newSecurityHandlerForFilter(String name)
{
Class<? extends SecurityHandler> handlerClass = nameToHandler.get(name);
if (handlerClass == null)
@@ -119,7 +119,7 @@
* @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<? extends ProtectionPolicy> newSecurityHandler(Class<? extends SecurityHandler> handlerClass,
+ private SecurityHandler<ProtectionPolicy> newSecurityHandler(Class<? extends SecurityHandler> handlerClass,
Class<?>[] argsClasses, Object[] args)
{
try
diff --git a/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java b/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java
index 273e38f..526acfd 100644
--- a/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java
+++ b/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java
@@ -339,7 +339,8 @@
TestPublicKeyEncryption.class.getResourceAsStream("PDFBOX-4421-keystore.pfx"),
"testnutzer"))
{
- Assert.assertTrue(doc.getEncryption().getSecurityHandler() instanceof PublicKeySecurityHandler);
+ Assert.assertEquals("PublicKeySecurityHandler",
+ doc.getEncryption().getSecurityHandler().getClass().getSimpleName());
Assert.assertEquals(128, doc.getEncryption().getSecurityHandler().getKeyLength());
PDFTextStripper stripper = new PDFTextStripper();
//Assert.assertEquals("Key length: 128", stripper.getText(doc).trim())
@@ -363,7 +364,8 @@
TestPublicKeyEncryption.class.getResourceAsStream("PDFBOX-4421-keystore.pfx"),
"testnutzer"))
{
- Assert.assertTrue(doc.getEncryption().getSecurityHandler() instanceof PublicKeySecurityHandler);
+ Assert.assertEquals("PublicKeySecurityHandler",
+ doc.getEncryption().getSecurityHandler().getClass().getSimpleName());
Assert.assertEquals(256, doc.getEncryption().getSecurityHandler().getKeyLength());
PDFTextStripper stripper = new PDFTextStripper();
//Assert.assertEquals("Key length: 256", stripper.getText(doc).trim())
