You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/09/27 13:17:56 UTC

svn commit: r1882068 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java

Author: lehmi
Date: Sun Sep 27 13:17:55 2020
New Revision: 1882068

URL: http://svn.apache.org/viewvc?rev=1882068&view=rev
Log:
PDFBOX-4892: use typed getter instead of generic one, simplify code

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java?rev=1882068&r1=1882067&r2=1882068&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java Sun Sep 27 13:17:55 2020
@@ -71,9 +71,9 @@ public class PDSeedValueCertificate impl
      */
     public PDSeedValueCertificate()
     {
-        this.dictionary = new COSDictionary();
-        this.dictionary.setItem(COSName.TYPE, COSName.SV_CERT);
-        this.dictionary.setDirect(true);
+        dictionary = new COSDictionary();
+        dictionary.setItem(COSName.TYPE, COSName.SV_CERT);
+        dictionary.setDirect(true);
     }
 
     /**
@@ -83,8 +83,8 @@ public class PDSeedValueCertificate impl
      */
     public PDSeedValueCertificate(COSDictionary dict)
     {
-        this.dictionary = dict;
-        this.dictionary.setDirect(true);
+        dictionary = dict;
+        dictionary.setDirect(true);
     }
 
     /**
@@ -104,7 +104,7 @@ public class PDSeedValueCertificate impl
      */
     public boolean isSubjectRequired()
     {
-        return this.getCOSObject().getFlag(COSName.FF, FLAG_SUBJECT);
+        return dictionary.getFlag(COSName.FF, FLAG_SUBJECT);
     }
 
     /**
@@ -114,7 +114,7 @@ public class PDSeedValueCertificate impl
      */
     public void setSubjectRequired(boolean flag)
     {
-        this.getCOSObject().setFlag(COSName.FF, FLAG_SUBJECT, flag);
+        dictionary.setFlag(COSName.FF, FLAG_SUBJECT, flag);
     }
 
     /**
@@ -123,7 +123,7 @@ public class PDSeedValueCertificate impl
      */
     public boolean isIssuerRequired()
     {
-        return this.getCOSObject().getFlag(COSName.FF, FLAG_ISSUER);
+        return dictionary.getFlag(COSName.FF, FLAG_ISSUER);
     }
 
     /**
@@ -133,7 +133,7 @@ public class PDSeedValueCertificate impl
      */
     public void setIssuerRequired(boolean flag)
     {
-        this.getCOSObject().setFlag(COSName.FF, FLAG_ISSUER, flag);
+        dictionary.setFlag(COSName.FF, FLAG_ISSUER, flag);
     }
 
     /**
@@ -142,7 +142,7 @@ public class PDSeedValueCertificate impl
      */
     public boolean isOIDRequired()
     {
-        return this.getCOSObject().getFlag(COSName.FF, FLAG_OID);
+        return dictionary.getFlag(COSName.FF, FLAG_OID);
     }
 
     /**
@@ -152,7 +152,7 @@ public class PDSeedValueCertificate impl
      */
     public void setOIDRequired(boolean flag)
     {
-        this.getCOSObject().setFlag(COSName.FF, FLAG_OID, flag);
+        dictionary.setFlag(COSName.FF, FLAG_OID, flag);
     }
 
     /**
@@ -161,7 +161,7 @@ public class PDSeedValueCertificate impl
      */
     public boolean isSubjectDNRequired()
     {
-        return this.getCOSObject().getFlag(COSName.FF, FLAG_SUBJECT_DN);
+        return dictionary.getFlag(COSName.FF, FLAG_SUBJECT_DN);
     }
 
     /**
@@ -171,7 +171,7 @@ public class PDSeedValueCertificate impl
      */
     public void setSubjectDNRequired(boolean flag)
     {
-        this.getCOSObject().setFlag(COSName.FF, FLAG_SUBJECT_DN, flag);
+        dictionary.setFlag(COSName.FF, FLAG_SUBJECT_DN, flag);
     }
 
     /**
@@ -180,7 +180,7 @@ public class PDSeedValueCertificate impl
      */
     public boolean isKeyUsageRequired()
     {
-        return this.getCOSObject().getFlag(COSName.FF, FLAG_KEY_USAGE);
+        return dictionary.getFlag(COSName.FF, FLAG_KEY_USAGE);
     }
 
     /**
@@ -190,7 +190,7 @@ public class PDSeedValueCertificate impl
      */
     public void setKeyUsageRequired(boolean flag)
     {
-        this.getCOSObject().setFlag(COSName.FF, FLAG_KEY_USAGE, flag);
+        dictionary.setFlag(COSName.FF, FLAG_KEY_USAGE, flag);
     }
 
     /**
@@ -199,7 +199,7 @@ public class PDSeedValueCertificate impl
      */
     public boolean isURLRequired()
     {
-        return this.getCOSObject().getFlag(COSName.FF, FLAG_URL);
+        return dictionary.getFlag(COSName.FF, FLAG_URL);
     }
 
     /**
@@ -209,7 +209,7 @@ public class PDSeedValueCertificate impl
      */
     public void setURLRequired(boolean flag)
     {
-        this.getCOSObject().setFlag(COSName.FF, FLAG_URL, flag);
+        dictionary.setFlag(COSName.FF, FLAG_URL, flag);
     }
 
     /**
@@ -217,13 +217,8 @@ public class PDSeedValueCertificate impl
      */
     public List<byte[]> getSubject()
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.SUBJECT);
-        if (base instanceof COSArray)
-        {
-            COSArray array = (COSArray) base;
-            return getListOfByteArraysFromCOSArray(array);
-        }
-        return null;
+        COSArray array = dictionary.getCOSArray(COSName.SUBJECT);
+        return array != null ? getListOfByteArraysFromCOSArray(array) : null;
     }
 
     /**
@@ -237,12 +232,7 @@ public class PDSeedValueCertificate impl
      */
     public void setSubject(List<byte[]> subjects)
     {
-        COSArray array = new COSArray();
-        for (byte[] subject : subjects)
-        {
-            array.add(new COSString(subject));
-        }
-        this.dictionary.setItem(COSName.SUBJECT, array);
+        dictionary.setItem(COSName.SUBJECT, convertListOfByteArraysToCOSArray(subjects));
     }
 
     /**
@@ -253,19 +243,13 @@ public class PDSeedValueCertificate impl
      */
     public void addSubject(byte[] subject)
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.SUBJECT);
-        COSArray array;
-        if (base instanceof COSArray)
-        {
-            array = (COSArray) base;
-        }
-        else
+        COSArray array = dictionary.getCOSArray(COSName.SUBJECT);
+        if (array == null)
         {
             array = new COSArray();
         }
-        COSString string = new COSString(subject);
-        array.add(string);
-        this.dictionary.setItem(COSName.SUBJECT, array);
+        array.add(new COSString(subject));
+        dictionary.setItem(COSName.SUBJECT, array);
     }
 
     /**
@@ -275,10 +259,9 @@ public class PDSeedValueCertificate impl
      */
     public void removeSubject(byte[] subject)
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.SUBJECT);
-        if (base instanceof COSArray)
+        COSArray array = dictionary.getCOSArray(COSName.SUBJECT);
+        if (array != null)
         {
-            COSArray array = (COSArray) base;
             array.remove(new COSString(subject));
         }
     }
@@ -290,13 +273,12 @@ public class PDSeedValueCertificate impl
      */
     public List<Map<String, String>> getSubjectDN()
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.SUBJECT_DN);
-        if (base instanceof COSArray)
+        COSArray cosArray = dictionary.getCOSArray(COSName.SUBJECT_DN);
+        if (cosArray != null)
         {
-            COSArray cosArray = (COSArray) base;
-            List subjectDNList = cosArray.toList();
+            List<? extends COSBase> subjectDNList = cosArray.toList();
             List<Map<String, String>> result = new LinkedList<>();
-            for (Object subjectDNItem : subjectDNList)
+            for (COSBase subjectDNItem : subjectDNList)
             {
                 if (subjectDNItem instanceof COSDictionary)
                 {
@@ -331,7 +313,7 @@ public class PDSeedValueCertificate impl
             subjectDNItem.forEach((key, value) -> dict.setItem(key, new COSString(value)));
             subjectDNDict.add(dict);
         }
-        this.dictionary.setItem(COSName.SUBJECT_DN,
+        dictionary.setItem(COSName.SUBJECT_DN,
                 COSArrayList.converterToCOSArray(subjectDNDict));
     }
 
@@ -353,10 +335,9 @@ public class PDSeedValueCertificate impl
      */
     public List<String> getKeyUsage()
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.KEY_USAGE);
-        if (base instanceof COSArray)
+        COSArray array = dictionary.getCOSArray(COSName.KEY_USAGE);
+        if (array != null)
         {
-            COSArray array = (COSArray) base;
             List<String> keyUsageExtensions = new LinkedList<>();
             for (COSBase item : array)
             {
@@ -392,7 +373,7 @@ public class PDSeedValueCertificate impl
      */
     public void setKeyUsage(List<String> keyUsageExtensions)
     {
-        this.dictionary.setItem(COSName.KEY_USAGE,
+        dictionary.setItem(COSName.KEY_USAGE,
                 COSArray.convertStringListToCOSStringCOSArray(keyUsageExtensions));
     }
 
@@ -412,19 +393,13 @@ public class PDSeedValueCertificate impl
                 throw new IllegalArgumentException("characters can only be 0, 1, X");
             }
         }
-        COSBase base = this.dictionary.getDictionaryObject(COSName.KEY_USAGE);
-        COSArray array;
-        if (base instanceof COSArray)
-        {
-            array = (COSArray) base;
-        }
-        else
+        COSArray array = dictionary.getCOSArray(COSName.KEY_USAGE);
+        if (array == null)
         {
             array = new COSArray();
         }
-        COSString string = new COSString(keyUsageExtension);
-        array.add(string);
-        this.dictionary.setItem(COSName.KEY_USAGE, array);
+        array.add(new COSString(keyUsageExtension));
+        dictionary.setItem(COSName.KEY_USAGE, array);
     }
 
     /**
@@ -465,10 +440,9 @@ public class PDSeedValueCertificate impl
      */
     public void removeKeyUsage(String keyUsageExtension)
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.KEY_USAGE);
-        if (base instanceof COSArray)
+        COSArray array = dictionary.getCOSArray(COSName.KEY_USAGE);
+        if (array != null)
         {
-            COSArray array = (COSArray) base;
             array.remove(new COSString(keyUsageExtension));
         }
     }
@@ -478,13 +452,8 @@ public class PDSeedValueCertificate impl
      */
     public List<byte[]> getIssuer()
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.ISSUER);
-        if (base instanceof COSArray)
-        {
-            COSArray array = (COSArray) base;
-            return getListOfByteArraysFromCOSArray(array);
-        }
-        return null;
+        COSArray array = dictionary.getCOSArray(COSName.ISSUER);
+        return array != null ? getListOfByteArraysFromCOSArray(array) : null;
     }
 
     /**
@@ -496,12 +465,7 @@ public class PDSeedValueCertificate impl
      */
     public void setIssuer(List<byte[]> issuers)
     {
-        COSArray array = new COSArray();
-        for (byte[] issuer : issuers)
-        {
-            array.add(new COSString(issuer));
-        }
-        this.dictionary.setItem(COSName.ISSUER, array);
+        dictionary.setItem(COSName.ISSUER, convertListOfByteArraysToCOSArray(issuers));
     }
 
     /**
@@ -513,19 +477,13 @@ public class PDSeedValueCertificate impl
      */
     public void addIssuer(byte[] issuer)
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.ISSUER);
-        COSArray array;
-        if (base instanceof COSArray)
-        {
-            array = (COSArray) base;
-        }
-        else
+        COSArray array = dictionary.getCOSArray(COSName.ISSUER);
+        if (array == null)
         {
             array = new COSArray();
         }
-        COSString string = new COSString(issuer);
-        array.add(string);
-        this.dictionary.setItem(COSName.ISSUER, array);
+        array.add(new COSString(issuer));
+        dictionary.setItem(COSName.ISSUER, array);
     }
 
     /**
@@ -535,10 +493,9 @@ public class PDSeedValueCertificate impl
      */
     public void removeIssuer(byte[] issuer)
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.ISSUER);
-        if (base instanceof COSArray)
+        COSArray array = dictionary.getCOSArray(COSName.ISSUER);
+        if (array != null)
         {
-            COSArray array = (COSArray) base;
             array.remove(new COSString(issuer));
         }
     }
@@ -549,13 +506,8 @@ public class PDSeedValueCertificate impl
      */
     public List<byte[]> getOID()
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.OID);
-        if (base instanceof COSArray)
-        {
-            COSArray array = (COSArray) base;
-            return getListOfByteArraysFromCOSArray(array);
-        }
-        return null;
+        COSArray array = dictionary.getCOSArray(COSName.OID);
+        return array != null ? getListOfByteArraysFromCOSArray(array) : null;
     }
 
     /**
@@ -567,12 +519,7 @@ public class PDSeedValueCertificate impl
      */
     public void setOID(List<byte[]> oidByteStrings)
     {
-        COSArray array = new COSArray();
-        for (byte[] oid : oidByteStrings)
-        {
-            array.add(new COSString(oid));
-        }
-        this.dictionary.setItem(COSName.OID, array);
+        dictionary.setItem(COSName.OID, convertListOfByteArraysToCOSArray(oidByteStrings));
     }
 
     /**
@@ -582,19 +529,13 @@ public class PDSeedValueCertificate impl
      */
     public void addOID(byte[] oid)
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.OID);
-        COSArray array;
-        if (base instanceof COSArray)
-        {
-            array = (COSArray) base;
-        }
-        else
+        COSArray array = dictionary.getCOSArray(COSName.OID);
+        if (array == null)
         {
             array = new COSArray();
         }
-        COSString string = new COSString(oid);
-        array.add(string);
-        this.dictionary.setItem(COSName.OID, array);
+        array.add(new COSString(oid));
+        dictionary.setItem(COSName.OID, array);
     }
 
     /**
@@ -604,10 +545,9 @@ public class PDSeedValueCertificate impl
      */
     public void removeOID(byte[] oid)
     {
-        COSBase base = this.dictionary.getDictionaryObject(COSName.OID);
-        if (base instanceof COSArray)
+        COSArray array = dictionary.getCOSArray(COSName.OID);
+        if (array != null)
         {
-            COSArray array = (COSArray) base;
             array.remove(new COSString(oid));
         }
     }
@@ -617,7 +557,7 @@ public class PDSeedValueCertificate impl
      */
     public String getURL()
     {
-        return this.dictionary.getString(COSName.URL);
+        return dictionary.getString(COSName.URL);
     }
 
     /**
@@ -627,7 +567,7 @@ public class PDSeedValueCertificate impl
      */
     public void setURL(String url)
     {
-        this.dictionary.setString(COSName.URL, url);
+        dictionary.setString(COSName.URL, url);
     }
 
     /**
@@ -647,7 +587,7 @@ public class PDSeedValueCertificate impl
      */
     public String getURLType()
     {
-        return this.dictionary.getNameAsString(COSName.URL_TYPE);
+        return dictionary.getNameAsString(COSName.URL_TYPE);
     }
 
     /**
@@ -672,7 +612,7 @@ public class PDSeedValueCertificate impl
      */
     public void setURLType(String urlType)
     {
-        this.dictionary.setName(COSName.URL_TYPE, urlType);
+        dictionary.setName(COSName.URL_TYPE, urlType);
     }
 
     private static List<byte[]> getListOfByteArraysFromCOSArray(COSArray array)
@@ -688,4 +628,10 @@ public class PDSeedValueCertificate impl
         return result;
     }
 
+    private static COSArray convertListOfByteArraysToCOSArray(List<byte[]> strings)
+    {
+        COSArray array = new COSArray();
+        strings.forEach(s -> array.add(new COSString(s)));
+        return array;
+    }
 }