root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Cache SpringFactoriesLoader loads 

Update `SpringFactoriesLoader` to cache property file loads. This helps
reduce the number of garbage objects created as each load uses an 8K
char buffer.

Issue: SPR-15509
This commit is contained in:
Phillip Webb 2017-05-02 12:09:17 -07:00 committed by Stephane Nicoll
parent ed4bd43cac
commit 07ef7a97c7
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -20,17 +20,21 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.core.io.UrlResource; import org.springframework.core.io.UrlResource;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ConcurrentReferenceHashMap;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -58,6 +62,8 @@ public abstract class SpringFactoriesLoader {
private static final Log logger = LogFactory.getLog(SpringFactoriesLoader.class); private static final Log logger = LogFactory.getLog(SpringFactoriesLoader.class);
private static Map<ClassLoader, MultiValueMap<String, String>> cache = new ConcurrentReferenceHashMap<>();
/** /**
* The location to look for factories. * The location to look for factories.
* <p>Can be present in multiple JAR files. * <p>Can be present in multiple JAR files.
@ -107,21 +113,36 @@ public abstract class SpringFactoriesLoader {
*/ */
public static List<String> loadFactoryNames(Class<?> factoryClass, ClassLoader classLoader) { public static List<String> loadFactoryNames(Class<?> factoryClass, ClassLoader classLoader) {
String factoryClassName = factoryClass.getName(); String factoryClassName = factoryClass.getName();
return loadSpringFactories(classLoader).getOrDefault(factoryClassName,
Collections.emptyList());
}
private static Map<String, List<String>> loadSpringFactories(
ClassLoader classLoader) {
MultiValueMap<String, String> result = cache.get(classLoader);
if (result != null)
return result;
try { try {
Enumeration<URL> urls = (classLoader != null ? classLoader.getResources(FACTORIES_RESOURCE_LOCATION) : Enumeration<URL> urls = (classLoader != null
ClassLoader.getSystemResources(FACTORIES_RESOURCE_LOCATION)); ? classLoader.getResources(FACTORIES_RESOURCE_LOCATION)
List<String> result = new ArrayList<>(); : ClassLoader.getSystemResources(FACTORIES_RESOURCE_LOCATION));
result = new LinkedMultiValueMap<>();
while (urls.hasMoreElements()) { while (urls.hasMoreElements()) {
URL url = urls.nextElement(); URL url = urls.nextElement();
Properties properties = PropertiesLoaderUtils.loadProperties(new UrlResource(url)); UrlResource resource = new UrlResource(url);
String factoryClassNames = properties.getProperty(factoryClassName); Properties properties = PropertiesLoaderUtils.loadProperties(resource);
result.addAll(Arrays.asList(StringUtils.commaDelimitedListToStringArray(factoryClassNames))); for (Map.Entry<?, ?> entry : properties.entrySet()) {
List<String> factoryClassNames = Arrays.asList(
StringUtils.commaDelimitedListToStringArray((String) entry.getValue()));
result.addAll((String) entry.getKey(), factoryClassNames);
}
} }
cache.put(classLoader, result);
return result; return result;
} }
catch (IOException ex) { catch (IOException ex) {
throw new IllegalArgumentException("Unable to load [" + factoryClass.getName() + throw new IllegalArgumentException("Unable to load factories from location ["
"] factories from location [" + FACTORIES_RESOURCE_LOCATION + "]", ex); + FACTORIES_RESOURCE_LOCATION + "]", ex);
} }
} }