svn commit: r1918260 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: cos/COSDictionary.java util/SmallMap.java

[lehmi]

Author: lehmi
Date: Tue Jun 11 17:21:47 2024
New Revision: 1918260

URL: http://svn.apache.org/viewvc?rev=1918260&view=rev
Log:
PDFBOX-5824: remove SmallMap optimisation based on a proposal from Jonathan 
Prates

Removed:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/SmallMap.java
Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1918260&r1=1918259&r2=1918260&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java 
Tue Jun 11 17:21:47 2024
@@ -34,7 +34,6 @@ import org.apache.logging.log4j.LogManag
 
 import org.apache.pdfbox.pdmodel.common.COSObjectable;
 import org.apache.pdfbox.util.DateConverter;
-import org.apache.pdfbox.util.SmallMap;
 
 /**
  * This class represents a dictionary where name/value pairs reside.
@@ -51,12 +50,11 @@ public class COSDictionary extends COSBa
     private static final Logger LOG = 
LogManager.getLogger(COSDictionary.class);
 
     private static final String PATH_SEPARATOR = "/";
-    private static final int MAP_THRESHOLD = 1000;
 
     /**
      * The name-value pairs of this dictionary. The pairs are kept in the 
order they were added to the dictionary.
      */
-    protected Map<COSName, COSBase> items = new SmallMap<>();
+    protected Map<COSName, COSBase> items = new LinkedHashMap<>();
     private final COSUpdateState updateState;
 
     /**
@@ -205,10 +203,6 @@ public class COSDictionary extends COSBa
         }
         else
         {
-            if (items instanceof SmallMap && items.size() >= MAP_THRESHOLD)
-            {
-                items = new LinkedHashMap<>(items);
-            }
             items.put(key, value);
             getUpdateState().update(value);
         }
@@ -1272,10 +1266,6 @@ public class COSDictionary extends COSBa
      */
     public void addAll(COSDictionary dict)
     {
-        if (items instanceof SmallMap && items.size() + dict.items.size() >= 
MAP_THRESHOLD)
-        {
-            items = new LinkedHashMap<>(items);
-        }
         items.putAll(dict.items);
     }