Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Arrays.copyOf and Arrays.copyOfRange where possible

Browse Source 
Closes gh-23393
This commit is contained in:
stsypanov
2019-07-31 19:17:22 +03:00
committed by Sam Brannen
parent 216ffcfe62
commit 78d56dc61b
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
View File

@@ -180,8 +180,7 @@ public abstract class AopProxyUtils {
if (proxy instanceof DecoratingProxy) {
nonUserIfcCount++;
}
Class<?>[] userInterfaces = new Class<?>[proxyInterfaces.length - nonUserIfcCount];
System.arraycopy(proxyInterfaces, 0, userInterfaces, 0, userInterfaces.length);
Class<?>[] userInterfaces = Arrays.copyOf(proxyInterfaces, proxyInterfaces.length - nonUserIfcCount);
Assert.notEmpty(userInterfaces, "JDK proxy must implement one or more interfaces");
return userInterfaces;
}

4
spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
View File

@@ -395,9 +395,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
logger.debug("Bean with name '" + finalName + "' concluding interceptor chain " +
"is not an advisor class: treating it as a target or TargetSource");
}
String[] newNames = new String[this.interceptorNames.length - 1];
System.arraycopy(this.interceptorNames, 0, newNames, 0, newNames.length);
this.interceptorNames = newNames;
this.interceptorNames = Arrays.copyOf(this.interceptorNames, this.interceptorNames.length - 1);
}
}
}

4
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
View File

@@ -25,6 +25,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -721,8 +722,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
synchronized (this) {
if (!this.cached) {
if (arguments != null) {
Object[] cachedMethodArguments = new Object[paramTypes.length];
System.arraycopy(descriptors, 0, cachedMethodArguments, 0, arguments.length);
DependencyDescriptor[] cachedMethodArguments = Arrays.copyOf(descriptors, arguments.length);
registerDependentBeans(beanName, autowiredBeans);
if (autowiredBeans.size() == paramTypes.length) {
Iterator<String> it = autowiredBeans.iterator();

3
spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java
View File

@@ -268,8 +268,7 @@ final class AttributeMethods {
return NONE;
}
Arrays.sort(methods, methodComparator);
Method[] attributeMethods = new Method[size];
System.arraycopy(methods, 0, attributeMethods, 0, size);
Method[] attributeMethods = Arrays.copyOf(methods, size);
return new AttributeMethods(annotationType, attributeMethods);
}

4
spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
View File

@@ -501,9 +501,7 @@ class Tokenizer {
}
private char[] subarray(int start, int end) {
char[] result = new char[end - start];
System.arraycopy(this.charsToProcess, start, result, 0, end - start);
return result;
return Arrays.copyOfRange(this.charsToProcess, start, end);
}
/**