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

Use nullSafeHashCode() in SynthesizedMergedAnnotationInvocationHandler

Browse Source 
In light of the refinements to ObjectUtils, this commit updates
SynthesizedMergedAnnotationInvocationHandler to use
ObjectUtils.nullSafeHashCode() and removes the now obsolete code in
SynthesizedMergedAnnotationInvocationHandler.

See gh-29051
This commit is contained in:
Sam Brannen
2023-09-13 16:49:24 +02:00
parent af13967e2a
commit a271d5ec15
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import java.lang.reflect.Array;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Arrays;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.concurrent.ConcurrentHashMap;
@@ -136,44 +135,11 @@ final class SynthesizedMergedAnnotationInvocationHandler<A extends Annotation> i
for (int i = 0; i < this.attributes.size(); i++) {
Method attribute = this.attributes.get(i);
Object value = getAttributeValue(attribute);
hashCode += (127 * attribute.getName().hashCode()) ^ getValueHashCode(value);
hashCode += (127 * attribute.getName().hashCode()) ^ ObjectUtils.nullSafeHashCode(value);
}
return hashCode;
}
private int getValueHashCode(Object value) {
// Use Arrays.hashCode(...) since Spring's ObjectUtils doesn't comply
// with the requirements specified in Annotation#hashCode().
if (value instanceof boolean[] booleans) {
return Arrays.hashCode(booleans);
}
if (value instanceof byte[] bytes) {
return Arrays.hashCode(bytes);
}
if (value instanceof char[] chars) {
return Arrays.hashCode(chars);
}
if (value instanceof double[] doubles) {
return Arrays.hashCode(doubles);
}
if (value instanceof float[] floats) {
return Arrays.hashCode(floats);
}
if (value instanceof int[] ints) {
return Arrays.hashCode(ints);
}
if (value instanceof long[] longs) {
return Arrays.hashCode(longs);
}
if (value instanceof short[] shorts) {
return Arrays.hashCode(shorts);
}
if (value instanceof Object[] objects) {
return Arrays.hashCode(objects);
}
return value.hashCode();
}
private String annotationToString() {
String string = this.string;
if (string == null) {