svn commit: r1921577 - in /xmlbeans/trunk/src/main/java/org/apache/xmlbeans: XmlOptionCharEscapeMap.java impl/common/QNameHelper.java impl/regex/SchemaRegularExpression.java impl/schema/StscComplexTypeResolver.java

[fanningpj]

Author: fanningpj
Date: Sat Oct 26 18:40:38 2024
New Revision: 1921577

URL: http://svn.apache.org/viewvc?rev=1921577&view=rev
Log:
immutable maps

Modified:
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java
    
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
    
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
    
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java?rev=1921577&r1=1921576&r2=1921577&view=diff
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java 
(original)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java 
Sat Oct 26 18:40:38 2024
@@ -15,6 +15,7 @@
 
 package org.apache.xmlbeans;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -53,14 +54,16 @@ public class XmlOptionCharEscapeMap {
     private final Map<Character, String> _charMap;
 
     // internal HashMap just for predefined entities
-    private static final Map<Character, String> _predefEntities = new 
HashMap<>();
+    private static final Map<Character, String> _predefEntities;
 
     static {
-        _predefEntities.put('<', "&lt;");
-        _predefEntities.put('>', "&gt;");
-        _predefEntities.put('&', "&amp;");
-        _predefEntities.put('\'', "&apos;");
-        _predefEntities.put('"', "&quot;");
+        final Map<Character, String> predefEntities = new HashMap<>();
+        predefEntities.put('<', "&lt;");
+        predefEntities.put('>', "&gt;");
+        predefEntities.put('&', "&amp;");
+        predefEntities.put('\'', "&apos;");
+        predefEntities.put('"', "&quot;");
+        _predefEntities = Collections.unmodifiableMap(predefEntities);
     }
 
     /**

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java?rev=1921577&r1=1921576&r2=1921577&view=diff
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java 
(original)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java 
Sat Oct 26 18:40:38 2024
@@ -180,7 +180,7 @@ public class QNameHelper
 
     private static Map<String, String> buildWKP()
     {
-        Map<String, String> result = new HashMap<>();
+        final Map<String, String> result = new HashMap<>();
         result.put("http://www.w3.org/XML/1998/namespace";, "xml");
         result.put("http://www.w3.org/2001/XMLSchema";, "xs");
         result.put("http://www.w3.org/2001/XMLSchema-instance";, "xsi");

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java?rev=1921577&r1=1921576&r2=1921577&view=diff
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
 (original)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
 Sat Oct 26 18:40:38 2024
@@ -39,7 +39,7 @@ public class SchemaRegularExpression ext
 
     private static Map<String, SchemaRegularExpression> buildKnownPatternMap()
     {
-        Map<String, SchemaRegularExpression> result = new HashMap<>();
+        final Map<String, SchemaRegularExpression> result = new HashMap<>();
         result.put("\\c+", new SchemaRegularExpression("\\c+")
             { public boolean matches(String s) { return 
XMLChar.isValidNmtoken(s); } } );
         result.put("\\i\\c*", new SchemaRegularExpression("\\i\\c*")

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java?rev=1921577&r1=1921576&r2=1921577&view=diff
==============================================================================
--- 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
 (original)
+++ 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
 Sat Oct 26 18:40:38 2024
@@ -1870,8 +1870,8 @@ public class StscComplexTypeResolver {
         new CodeForNameEntry(QNameHelper.forLNS("group", 
"http://www.w3.org/2001/XMLSchema";), MODEL_GROUP_CODE),
     };
 
-    private static final Map<QName, Integer> particleCodeMap =
-        Stream.of(particleCodes).collect(Collectors.toMap(pc -> pc.name, pc -> 
pc.code));
+    private static final Map<QName, Integer> particleCodeMap = 
Collections.unmodifiableMap(
+        Stream.of(particleCodes).collect(Collectors.toMap(pc -> pc.name, pc -> 
pc.code)));
 
     private static int translateParticleCode(Group parseEg) {
         if (parseEg == null) {
@@ -1896,8 +1896,8 @@ public class StscComplexTypeResolver {
         new CodeForNameEntry(QNameHelper.forLNS("anyAttribute", 
"http://www.w3.org/2001/XMLSchema";), ANY_ATTRIBUTE_CODE),
     };
 
-    private static final Map<QName,Integer> attributeCodeMap =
-        Stream.of(attributeCodes).collect(Collectors.toMap(ac -> ac.name, ac 
-> ac.code));
+    private static final Map<QName,Integer> attributeCodeMap = 
Collections.unmodifiableMap(
+        Stream.of(attributeCodes).collect(Collectors.toMap(ac -> ac.name, ac 
-> ac.code)));
 
     static int translateAttributeCode(QName currentName) {
         return attributeCodeMap.getOrDefault(currentName, 0);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org