PDFBOX-5998: avoid unnecessary map lookups based on a proposal by Axel Howind

lehmi · lehmi · commit 96856ee9704c · 2025-05-04T11:40:47.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1925396 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java b/fontbox/src/main/java/org/apache/fontbox/cff/CFFCIDFont.java
@@ -179,8 +179,8 @@ private int getDefaultWidthX(int gid)
         {
             return 1000;
         }
-        Map<String, Object> privDict = this.privateDictionaries.get(fdArrayIndex);
-        return privDict.containsKey("defaultWidthX") ? ((Number)privDict.get("defaultWidthX")).intValue() : 1000;
+        Object privDictValue = this.privateDictionaries.get(fdArrayIndex).get("defaultWidthX");
+        return privDictValue instanceof Number ? ((Number) privDictValue).intValue() : 1000;
     }
 
     /**
@@ -195,8 +195,8 @@ private int getNominalWidthX(int gid)
         {
             return 0;
         }
-        Map<String, Object> privDict = this.privateDictionaries.get(fdArrayIndex);
-        return privDict.containsKey("nominalWidthX") ? ((Number)privDict.get("nominalWidthX")).intValue() : 0;
+        Object privDictValue = this.privateDictionaries.get(fdArrayIndex).get("nominalWidthX");
+        return privDictValue instanceof Number ? ((Number) privDictValue).intValue() : 0;
     }
 
     /**
diff --git a/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java b/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
@@ -674,13 +674,13 @@ else if (charStringsIndex.length > 0)
 
             parseCIDFontDicts(input, topDict, (CFFCIDFont) font, numEntries);
 
-            List<Number> privMatrix = null;
             List<Map<String, Object>> fontDicts = ((CFFCIDFont) font).getFontDicts();
-            if (!fontDicts.isEmpty() && fontDicts.get(0).containsKey("FontMatrix"))
+            List<Number> privMatrix = null;
+            if (!fontDicts.isEmpty())
             {
-                privMatrix = (List<Number>) fontDicts.get(0).get("FontMatrix");
+                privMatrix = (List<Number>) fontDicts.get(0).getOrDefault("FontMatrix", null);
             }
-            // some malformed fonts have FontMatrix in their Font DICT, see PDFBOX-2495
+            // some malformed fonts have FontMatrix in their Font DICT, seePDFBOX-2495
             List<Number> matrix = topDict.getArray("FontMatrix", null);
             if (matrix == null)
             {
diff --git a/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java b/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java
@@ -242,15 +242,12 @@ public int toCID(byte[] code)
             return 0;
         }
         Integer cid = null;
-        if (codeToCid.containsKey(code.length))
-        {
-            cid = codeToCid.get(code.length).get(toInt(code));
-        }
-        if (cid == null)
+        Map<Integer, Integer> codeToCidMap = codeToCid.get(code.length);
+        if (codeToCidMap != null)
         {
-            cid = toCIDFromRanges(code);
+            cid = codeToCidMap.get(toInt(code));
         }
-        return cid;
+        return cid != null ? cid : toCIDFromRanges(code);
     }
 
     /**
@@ -294,9 +291,10 @@ public int toCID(int code, int length)
             return 0;
         }
         Integer cid = null;
-        if (codeToCid.containsKey(length))
+        Map<Integer, Integer> codeToCidMap = codeToCid.get(length);
+        if (codeToCidMap != null)
         {
-            cid = codeToCid.get(length).get(code);
+            cid = codeToCidMap.get(code);
         }
         return cid != null ? cid : toCIDFromRanges(code, length);
     }
diff --git a/fontbox/src/main/java/org/apache/fontbox/ttf/VerticalOriginTable.java b/fontbox/src/main/java/org/apache/fontbox/ttf/VerticalOriginTable.java
@@ -91,13 +91,6 @@ public float getVersion()
      */
     public int getOriginY(int gid)
     {
-        if (origins.containsKey(gid))
-        {
-            return origins.get(gid);
-        }
-        else
-        {
-            return defaultVertOriginY;
-        }
+        return origins.getOrDefault(gid, defaultVertOriginY);
     }
 }
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElement.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElement.java
@@ -603,14 +603,10 @@ public void setActualText(String actualText)
     public String getStandardStructureType()
     {
         String type = this.getStructureType();
-        Map<String,Object> roleMap = getRoleMap();
-        if (roleMap.containsKey(type))
+        Object mappedValue = getRoleMap().get(type);
+        if (mappedValue instanceof String)
         {
-            Object mappedValue = getRoleMap().get(type);
-            if (mappedValue instanceof String)
-            {
-                type = (String)mappedValue;
-            }
+            type = (String) mappedValue;
         }
         return type;
     }
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
@@ -78,10 +78,7 @@ public class PDTrueTypeFont extends PDSimpleFont implements PDVectorFont
     {
         MacOSRomanEncoding.INSTANCE.getCodeToNameMap().forEach((key, value) ->
         {
-            if (!INVERTED_MACOS_ROMAN.containsKey(value))
-            {
-                INVERTED_MACOS_ROMAN.put(value, key);
-            }
+            INVERTED_MACOS_ROMAN.putIfAbsent(value, key);
         });
     }
 
@@ -93,7 +90,7 @@ public class PDTrueTypeFont extends PDSimpleFont implements PDVectorFont
     private CmapSubtable cmapWinSymbol = null;
     private CmapSubtable cmapMacRoman = null;
     private boolean cmapInitialized = false;
-    private Map<Integer, Integer> gidToCode; // for embedding
+    private final Map<Integer, Integer> gidToCode = new HashMap<>(); // for embedding
     private BoundingBox fontBBox;
 
     /**
@@ -454,19 +451,15 @@ protected byte[] encode(int unicode) throws IOException
      */
     protected Map<Integer, Integer> getGIDToCode() throws IOException
     {
-        if (gidToCode != null)
+        if (!gidToCode.isEmpty())
         {
             return gidToCode;
         }
 
-        gidToCode = new HashMap<>();
         for (int code = 0; code <= 255; code++)
         {
             int gid = codeToGID(code);
-            if (!gidToCode.containsKey(gid))
-            {
-                gidToCode.put(gid, code);
-            }
+            gidToCode.putIfAbsent(gid, code);
         }
         return gidToCode;
     }
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java
@@ -136,12 +136,6 @@ private void loadList(InputStream input) throws IOException
                     String name = parts[0];
                     String[] unicodeList = parts[1].split(" ");
 
-                    if (nameToUnicode.containsKey(name))
-                    {
-                        LOG.warn("duplicate value for {} -> {} {}", name, parts[1],
-                                nameToUnicode.get(name));
-                    }
-
                     int[] codePoints = new int[unicodeList.length];
                     int index = 0;
                     for (String hex : unicodeList)
@@ -151,8 +145,11 @@ private void loadList(InputStream input) throws IOException
                     String string = new String(codePoints, 0 , codePoints.length);
 
                     // forward mapping
-                    nameToUnicode.put(name, string);
-
+                    String oldMapping = nameToUnicode.put(name, string);
+                    if (oldMapping != null)
+                    {
+                        LOG.warn("duplicate value for {} -> {} {}", name, parts[1], oldMapping);
+                    }
                     // reverse mapping
                     // PDFBOX-3884: take the various standard encodings as canonical, 
                     // e.g. tilde over ilde
@@ -162,10 +159,14 @@ private void loadList(InputStream input) throws IOException
                           MacExpertEncoding.INSTANCE.contains(name) ||
                           SymbolEncoding.INSTANCE.contains(name) ||
                           ZapfDingbatsEncoding.INSTANCE.contains(name);
-                    if (!unicodeToName.containsKey(string) || forceOverride)
+                    if (forceOverride)
                     {
                         unicodeToName.put(string, name);
                     }
+                    else
+                    {
+                        unicodeToName.putIfAbsent(string, name);
+                    }
                 }
             }
         }
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java
@@ -586,11 +586,8 @@ public void setBlendMode(BlendMode bm)
      */
     public PDSoftMask getSoftMask()
     {
-        if (!dict.containsKey(COSName.SMASK))
-        {
-            return null;
-        }
-        return PDSoftMask.create(dict.getDictionaryObject(COSName.SMASK));
+        COSBase smask = dict.getDictionaryObject(COSName.SMASK);
+        return smask == null ? null : PDSoftMask.create(smask);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,8 @@ private int getDefaultWidthX(int gid)`
`179`	`179`	`{`
`180`	`180`	`return 1000;`
`181`	`181`	`}`
`182`		`- Map<String, Object> privDict = this.privateDictionaries.get(fdArrayIndex);`
`183`		`- return privDict.containsKey("defaultWidthX") ? ((Number)privDict.get("defaultWidthX")).intValue() : 1000;`
	`182`	`+ Object privDictValue = this.privateDictionaries.get(fdArrayIndex).get("defaultWidthX");`
	`183`	`+ return privDictValue instanceof Number ? ((Number) privDictValue).intValue() : 1000;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/**`
`@@ -195,8 +195,8 @@ private int getNominalWidthX(int gid)`
`195`	`195`	`{`
`196`	`196`	`return 0;`
`197`	`197`	`}`
`198`		`- Map<String, Object> privDict = this.privateDictionaries.get(fdArrayIndex);`
`199`		`- return privDict.containsKey("nominalWidthX") ? ((Number)privDict.get("nominalWidthX")).intValue() : 0;`
	`198`	`+ Object privDictValue = this.privateDictionaries.get(fdArrayIndex).get("nominalWidthX");`
	`199`	`+ return privDictValue instanceof Number ? ((Number) privDictValue).intValue() : 0;`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -674,13 +674,13 @@ else if (charStringsIndex.length > 0)`
`674`	`674`
`675`	`675`	`parseCIDFontDicts(input, topDict, (CFFCIDFont) font, numEntries);`
`676`	`676`
`677`		`- List<Number> privMatrix = null;`
`678`	`677`	`List<Map<String, Object>> fontDicts = ((CFFCIDFont) font).getFontDicts();`
`679`		`- if (!fontDicts.isEmpty() && fontDicts.get(0).containsKey("FontMatrix"))`
	`678`	`+ List<Number> privMatrix = null;`
	`679`	`+ if (!fontDicts.isEmpty())`
`680`	`680`	`{`
`681`		`- privMatrix = (List<Number>) fontDicts.get(0).get("FontMatrix");`
	`681`	`+ privMatrix = (List<Number>) fontDicts.get(0).getOrDefault("FontMatrix", null);`
`682`	`682`	`}`
`683`		`- // some malformed fonts have FontMatrix in their Font DICT, see PDFBOX-2495`
	`683`	`+ // some malformed fonts have FontMatrix in their Font DICT, seePDFBOX-2495`
`684`	`684`	`List<Number> matrix = topDict.getArray("FontMatrix", null);`
`685`	`685`	`if (matrix == null)`
`686`	`686`	`{`
Original file line number	Diff line number	Diff line change
`@@ -242,15 +242,12 @@ public int toCID(byte[] code)`
`242`	`242`	`return 0;`
`243`	`243`	`}`
`244`	`244`	`Integer cid = null;`
`245`		`- if (codeToCid.containsKey(code.length))`
`246`		`- {`
`247`		`- cid = codeToCid.get(code.length).get(toInt(code));`
`248`		`- }`
`249`		`- if (cid == null)`
	`245`	`+ Map<Integer, Integer> codeToCidMap = codeToCid.get(code.length);`
	`246`	`+ if (codeToCidMap != null)`
`250`	`247`	`{`
`251`		`- cid = toCIDFromRanges(code);`
	`248`	`+ cid = codeToCidMap.get(toInt(code));`
`252`	`249`	`}`
`253`		`- return cid;`
	`250`	`+ return cid != null ? cid : toCIDFromRanges(code);`
`254`	`251`	`}`
`255`	`252`
`256`	`253`	`/**`
`@@ -294,9 +291,10 @@ public int toCID(int code, int length)`
`294`	`291`	`return 0;`
`295`	`292`	`}`
`296`	`293`	`Integer cid = null;`
`297`		`- if (codeToCid.containsKey(length))`
	`294`	`+ Map<Integer, Integer> codeToCidMap = codeToCid.get(length);`
	`295`	`+ if (codeToCidMap != null)`
`298`	`296`	`{`
`299`		`- cid = codeToCid.get(length).get(code);`
	`297`	`+ cid = codeToCidMap.get(code);`
`300`	`298`	`}`
`301`	`299`	`return cid != null ? cid : toCIDFromRanges(code, length);`
`302`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,6 @@ public float getVersion()`
`91`	`91`	`*/`
`92`	`92`	`public int getOriginY(int gid)`
`93`	`93`	`{`
`94`		`- if (origins.containsKey(gid))`
`95`		`- {`
`96`		`- return origins.get(gid);`
`97`		`- }`
`98`		`- else`
`99`		`- {`
`100`		`- return defaultVertOriginY;`
`101`		`- }`
	`94`	`+ return origins.getOrDefault(gid, defaultVertOriginY);`
`102`	`95`	`}`
`103`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -603,14 +603,10 @@ public void setActualText(String actualText)`
`603`	`603`	`public String getStandardStructureType()`
`604`	`604`	`{`
`605`	`605`	`String type = this.getStructureType();`
`606`		`- Map<String,Object> roleMap = getRoleMap();`
`607`		`- if (roleMap.containsKey(type))`
	`606`	`+ Object mappedValue = getRoleMap().get(type);`
	`607`	`+ if (mappedValue instanceof String)`
`608`	`608`	`{`
`609`		`- Object mappedValue = getRoleMap().get(type);`
`610`		`- if (mappedValue instanceof String)`
`611`		`- {`
`612`		`- type = (String)mappedValue;`
`613`		`- }`
	`609`	`+ type = (String) mappedValue;`
`614`	`610`	`}`
`615`	`611`	`return type;`
`616`	`612`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,7 @@ public class PDTrueTypeFont extends PDSimpleFont implements PDVectorFont`
`78`	`78`	`{`
`79`	`79`	`MacOSRomanEncoding.INSTANCE.getCodeToNameMap().forEach((key, value) ->`
`80`	`80`	`{`
`81`		`- if (!INVERTED_MACOS_ROMAN.containsKey(value))`
`82`		`- {`
`83`		`- INVERTED_MACOS_ROMAN.put(value, key);`
`84`		`- }`
	`81`	`+ INVERTED_MACOS_ROMAN.putIfAbsent(value, key);`
`85`	`82`	`});`
`86`	`83`	`}`
`87`	`84`
`@@ -93,7 +90,7 @@ public class PDTrueTypeFont extends PDSimpleFont implements PDVectorFont`
`93`	`90`	`private CmapSubtable cmapWinSymbol = null;`
`94`	`91`	`private CmapSubtable cmapMacRoman = null;`
`95`	`92`	`private boolean cmapInitialized = false;`
`96`		`- private Map<Integer, Integer> gidToCode; // for embedding`
	`93`	`+ private final Map<Integer, Integer> gidToCode = new HashMap<>(); // for embedding`
`97`	`94`	`private BoundingBox fontBBox;`
`98`	`95`
`99`	`96`	`/**`
`@@ -454,19 +451,15 @@ protected byte[] encode(int unicode) throws IOException`
`454`	`451`	`*/`
`455`	`452`	`protected Map<Integer, Integer> getGIDToCode() throws IOException`
`456`	`453`	`{`
`457`		`- if (gidToCode != null)`
	`454`	`+ if (!gidToCode.isEmpty())`
`458`	`455`	`{`
`459`	`456`	`return gidToCode;`
`460`	`457`	`}`
`461`	`458`
`462`		`- gidToCode = new HashMap<>();`
`463`	`459`	`for (int code = 0; code <= 255; code++)`
`464`	`460`	`{`
`465`	`461`	`int gid = codeToGID(code);`
`466`		`- if (!gidToCode.containsKey(gid))`
`467`		`- {`
`468`		`- gidToCode.put(gid, code);`
`469`		`- }`
	`462`	`+ gidToCode.putIfAbsent(gid, code);`
`470`	`463`	`}`
`471`	`464`	`return gidToCode;`
`472`	`465`	`}`
Original file line number	Diff line number	Diff line change
`@@ -586,11 +586,8 @@ public void setBlendMode(BlendMode bm)`
`586`	`586`	`*/`
`587`	`587`	`public PDSoftMask getSoftMask()`
`588`	`588`	`{`
`589`		`- if (!dict.containsKey(COSName.SMASK))`
`590`		`- {`
`591`		`- return null;`
`592`		`- }`
`593`		`- return PDSoftMask.create(dict.getDictionaryObject(COSName.SMASK));`
	`589`	`+ COSBase smask = dict.getDictionaryObject(COSName.SMASK);`
	`590`	`+ return smask == null ? null : PDSoftMask.create(smask);`
`594`	`591`	`}`
`595`	`592`
`596`	`593`	`/**`