HV-1084 Avoiding ConcurrentHashMap for immutable maps

hibernate · Aug 22, 2016 · d27a0e0 · d27a0e0
1 parent 365c8f5
commit d27a0e0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java b/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java
@@ -10,12 +10,11 @@
 import java.io.InputStream;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import javax.validation.BootstrapConfiguration;
 import javax.validation.executable.ExecutableType;
@@ -41,18 +40,18 @@ public class ValidationXmlParser {
 	private static final Log log = LoggerFactory.make();
 
 	private static final String VALIDATION_XML_FILE = "META-INF/validation.xml";
-	private static final ConcurrentMap<String, String> SCHEMAS_BY_VERSION = new ConcurrentHashMap<String, String>(
-			2,
-			0.75f,
-			1
-	);
+	private static final Map<String, String> SCHEMAS_BY_VERSION = Collections.unmodifiableMap( getSchemasByVersion() );
 
 	private final ClassLoader externalClassLoader;
 
-	static {
-		SCHEMAS_BY_VERSION.put( "1.0", "META-INF/validation-configuration-1.0.xsd" );
-		SCHEMAS_BY_VERSION.put( "1.1", "META-INF/validation-configuration-1.1.xsd" );
-		SCHEMAS_BY_VERSION.put( "2.0", "META-INF/validation-configuration-2.0.xsd" );
+	private static Map<String, String> getSchemasByVersion() {
+		Map<String, String> schemasByVersion = new HashMap<String, String>();
+
+		schemasByVersion.put( "1.0", "META-INF/validation-configuration-1.0.xsd" );
+		schemasByVersion.put( "1.1", "META-INF/validation-configuration-1.1.xsd" );
+		schemasByVersion.put( "2.0", "META-INF/validation-configuration-2.0.xsd" );
+
+		return schemasByVersion;
 	}
 
 	public ValidationXmlParser(ClassLoader externalClassLoader) {

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java b/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java
@@ -17,11 +17,10 @@
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ParameterNameProvider;
@@ -65,16 +64,16 @@ public class XmlMappingParser {
 
 	private final ClassLoadingHelper classLoadingHelper;
 
-	private static final ConcurrentMap<String, String> SCHEMAS_BY_VERSION = new ConcurrentHashMap<String, String>(
-			2,
-			0.75f,
-			1
-	);
+	private static final Map<String, String> SCHEMAS_BY_VERSION = Collections.unmodifiableMap( getSchemasByVersion() );
 
-	static {
-		SCHEMAS_BY_VERSION.put( "1.0", "META-INF/validation-mapping-1.0.xsd" );
-		SCHEMAS_BY_VERSION.put( "1.1", "META-INF/validation-mapping-1.1.xsd" );
-		SCHEMAS_BY_VERSION.put( "2.0", "META-INF/validation-mapping-2.0.xsd" );
+	private static Map<String, String> getSchemasByVersion() {
+		Map<String, String> schemasByVersion = new HashMap<String, String>();
+
+		schemasByVersion.put( "1.0", "META-INF/validation-mapping-1.0.xsd" );
+		schemasByVersion.put( "1.1", "META-INF/validation-mapping-1.1.xsd" );
+		schemasByVersion.put( "2.0", "META-INF/validation-mapping-2.0.xsd" );
+
+		return schemasByVersion;
 	}
 
 	public XmlMappingParser(ConstraintHelper constraintHelper, ParameterNameProvider parameterNameProvider,