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

Polish ExtendedBeanInfo

This commit is contained in:
Sam Brannen 2022-05-02 17:05:25 +02:00
parent 3b64529f81
commit f934c09211
2 changed files with 49 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 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.
@ -137,8 +137,9 @@ class ExtendedBeanInfo implements BeanInfo {
} }
} }
// Sort non-void returning write methods to guard against the ill effects of // Sort non-void returning write methods to guard against the ill effects of
// non-deterministic sorting of methods returned from Class#getDeclaredMethods // non-deterministic sorting of methods returned from Class#getMethods.
// under JDK 7. See https://bugs.java.com/view_bug.do?bug_id=7023180 // For historical reasons, the natural sort order is reversed.
// See https://github.com/spring-projects/spring-framework/issues/14744.
matches.sort(Comparator.comparing(Method::toString).reversed()); matches.sort(Comparator.comparing(Method::toString).reversed());
return matches; return matches;
} }

114
spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2022 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.
@ -18,7 +18,6 @@ package org.springframework.beans;
import java.beans.BeanInfo; import java.beans.BeanInfo;
import java.beans.IndexedPropertyDescriptor; import java.beans.IndexedPropertyDescriptor;
import java.beans.IntrospectionException;
import java.beans.Introspector; import java.beans.Introspector;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -28,6 +27,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.beans.testfixture.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
/** /**
* @author Chris Beams * @author Chris Beams
@ -35,10 +35,10 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Sam Brannen * @author Sam Brannen
* @since 3.1 * @since 3.1
*/ */
public class ExtendedBeanInfoTests { class ExtendedBeanInfoTests {
@Test @Test
public void standardReadMethodOnly() throws IntrospectionException { void standardReadMethodOnly() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public String getFoo() { return null; } public String getFoo() { return null; }
} }
@ -54,7 +54,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void standardWriteMethodOnly() throws IntrospectionException { void standardWriteMethodOnly() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public void setFoo(String f) { } public void setFoo(String f) { }
} }
@ -70,7 +70,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void standardReadAndWriteMethods() throws IntrospectionException { void standardReadAndWriteMethods() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public void setFoo(String f) { } public void setFoo(String f) { }
public String getFoo() { return null; } public String getFoo() { return null; }
@ -87,7 +87,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void nonStandardWriteMethodOnly() throws IntrospectionException { void nonStandardWriteMethodOnly() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public C setFoo(String foo) { return this; } public C setFoo(String foo) { return this; }
} }
@ -103,7 +103,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void standardReadAndNonStandardWriteMethods() throws IntrospectionException { void standardReadAndNonStandardWriteMethods() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public String getFoo() { return null; } public String getFoo() { return null; }
public C setFoo(String foo) { return this; } public C setFoo(String foo) { return this; }
@ -116,15 +116,12 @@ public class ExtendedBeanInfoTests {
ExtendedBeanInfo ebi = new ExtendedBeanInfo(bi); ExtendedBeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(hasReadMethodForProperty(bi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(bi, "foo")).isFalse();
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
} }
@Test @Test
public void standardReadAndNonStandardIndexedWriteMethod() throws IntrospectionException { void standardReadAndNonStandardIndexedWriteMethod() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public String[] getFoo() { return null; } public String[] getFoo() { return null; }
public C setFoo(int i, String foo) { return this; } public C setFoo(int i, String foo) { return this; }
@ -144,7 +141,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void standardReadMethodsAndOverloadedNonStandardWriteMethods() throws Exception { void standardReadMethodsAndOverloadedNonStandardWriteMethods() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public String getFoo() { return null; } public String getFoo() { return null; }
public C setFoo(String foo) { return this; } public C setFoo(String foo) { return this; }
@ -158,9 +155,6 @@ public class ExtendedBeanInfoTests {
ExtendedBeanInfo ebi = new ExtendedBeanInfo(bi); ExtendedBeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(hasReadMethodForProperty(bi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(bi, "foo")).isFalse();
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
@ -174,7 +168,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void cornerSpr9414() throws IntrospectionException { void cornerSpr9414() throws Exception {
@SuppressWarnings("unused") class Parent { @SuppressWarnings("unused") class Parent {
public Number getProperty1() { public Number getProperty1() {
return 1; return 1;
@ -197,8 +191,8 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void cornerSpr9453() throws IntrospectionException { void cornerSpr9453() throws Exception {
final class Bean implements Spr9453<Class<?>> { class Bean implements Spr9453<Class<?>> {
@Override @Override
public Class<?> getProp() { public Class<?> getProp() {
return null; return null;
@ -215,7 +209,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void standardReadMethodInSuperclassAndNonStandardWriteMethodInSubclass() throws Exception { void standardReadMethodInSuperclassAndNonStandardWriteMethodInSubclass() throws Exception {
@SuppressWarnings("unused") class B { @SuppressWarnings("unused") class B {
public String getFoo() { return null; } public String getFoo() { return null; }
} }
@ -230,15 +224,12 @@ public class ExtendedBeanInfoTests {
ExtendedBeanInfo ebi = new ExtendedBeanInfo(bi); ExtendedBeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(hasReadMethodForProperty(bi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(bi, "foo")).isFalse();
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
} }
@Test @Test
public void standardReadMethodInSuperAndSubclassesAndGenericBuilderStyleNonStandardWriteMethodInSuperAndSubclasses() throws Exception { void standardReadMethodInSuperAndSubclassesAndGenericBuilderStyleNonStandardWriteMethodInSuperAndSubclasses() throws Exception {
abstract class B<This extends B<This>> { abstract class B<This extends B<This>> {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected final This instance = (This) this; protected final This instance = (This) this;
@ -276,12 +267,6 @@ public class ExtendedBeanInfoTests {
BeanInfo ebi = new ExtendedBeanInfo(bi); BeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(hasReadMethodForProperty(bi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(bi, "foo")).isFalse();
assertThat(hasReadMethodForProperty(bi, "bar")).isTrue();
assertThat(hasWriteMethodForProperty(bi, "bar")).isFalse();
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
@ -290,7 +275,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void nonPublicStandardReadAndWriteMethods() throws Exception { void nonPublicStandardReadAndWriteMethods() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
String getFoo() { return null; } String getFoo() { return null; }
C setFoo(String foo) { return this; } C setFoo(String foo) { return this; }
@ -311,7 +296,7 @@ public class ExtendedBeanInfoTests {
* in strange edge cases. * in strange edge cases.
*/ */
@Test @Test
public void readMethodReturnsSupertypeOfWriteMethodParameter() throws IntrospectionException { void readMethodReturnsSupertypeOfWriteMethodParameter() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Number getFoo() { return null; } public Number getFoo() { return null; }
public void setFoo(Integer foo) { } public void setFoo(Integer foo) { }
@ -326,7 +311,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void indexedReadMethodReturnsSupertypeOfIndexedWriteMethodParameter() throws IntrospectionException { void indexedReadMethodReturnsSupertypeOfIndexedWriteMethodParameter() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Number getFoos(int index) { return null; } public Number getFoos(int index) { return null; }
public void setFoos(int index, Integer foo) { } public void setFoos(int index, Integer foo) { }
@ -345,7 +330,7 @@ public class ExtendedBeanInfoTests {
* in strange edge cases. * in strange edge cases.
*/ */
@Test @Test
public void readMethodReturnsSubtypeOfWriteMethodParameter() throws IntrospectionException { void readMethodReturnsSubtypeOfWriteMethodParameter() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Integer getFoo() { return null; } public Integer getFoo() { return null; }
public void setFoo(Number foo) { } public void setFoo(Number foo) { }
@ -362,7 +347,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void indexedReadMethodReturnsSubtypeOfIndexedWriteMethodParameter() throws IntrospectionException { void indexedReadMethodReturnsSubtypeOfIndexedWriteMethodParameter() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Integer getFoos(int index) { return null; } public Integer getFoos(int index) { return null; }
public void setFoo(int index, Number foo) { } public void setFoo(int index, Number foo) { }
@ -379,7 +364,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void indexedReadMethodOnly() throws IntrospectionException { void indexedReadMethodOnly() throws Exception {
@SuppressWarnings("unused") @SuppressWarnings("unused")
class C { class C {
// indexed read method // indexed read method
@ -397,7 +382,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void indexedWriteMethodOnly() throws IntrospectionException { void indexedWriteMethodOnly() throws Exception {
@SuppressWarnings("unused") @SuppressWarnings("unused")
class C { class C {
// indexed write method // indexed write method
@ -415,7 +400,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void indexedReadAndIndexedWriteMethods() throws IntrospectionException { void indexedReadAndIndexedWriteMethods() throws Exception {
@SuppressWarnings("unused") @SuppressWarnings("unused")
class C { class C {
// indexed read method // indexed read method
@ -439,7 +424,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void readAndWriteAndIndexedReadAndIndexedWriteMethods() throws IntrospectionException { void readAndWriteAndIndexedReadAndIndexedWriteMethods() throws Exception {
@SuppressWarnings("unused") @SuppressWarnings("unused")
class C { class C {
// read method // read method
@ -467,7 +452,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void indexedReadAndNonStandardIndexedWrite() throws IntrospectionException { void indexedReadAndNonStandardIndexedWrite() throws Exception {
@SuppressWarnings("unused") @SuppressWarnings("unused")
class C { class C {
// indexed read method // indexed read method
@ -489,7 +474,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void indexedReadAndNonStandardWriteAndNonStandardIndexedWrite() throws IntrospectionException { void indexedReadAndNonStandardWriteAndNonStandardIndexedWrite() throws Exception {
@SuppressWarnings("unused") @SuppressWarnings("unused")
class C { class C {
// non-standard write method // non-standard write method
@ -519,7 +504,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void cornerSpr9702() throws IntrospectionException { void cornerSpr9702() throws Exception {
{ // baseline with standard write method { // baseline with standard write method
@SuppressWarnings("unused") @SuppressWarnings("unused")
class C { class C {
@ -569,16 +554,16 @@ public class ExtendedBeanInfoTests {
* IntrospectionException regarding a "type mismatch between indexed and non-indexed * IntrospectionException regarding a "type mismatch between indexed and non-indexed
* methods" intermittently (approximately one out of every four times) under JDK 7 * methods" intermittently (approximately one out of every four times) under JDK 7
* due to non-deterministic results from {@link Class#getDeclaredMethods()}. * due to non-deterministic results from {@link Class#getDeclaredMethods()}.
* See https://bugs.java.com/view_bug.do?bug_id=7023180 * See https://bugs.java.com/bugdatabase/view_bug.do?bug_id=7023180
* @see #cornerSpr9702() * @see #cornerSpr9702()
*/ */
@Test @Test
public void cornerSpr10111() throws Exception { void cornerSpr10111() throws Exception {
new ExtendedBeanInfo(Introspector.getBeanInfo(BigDecimal.class)); assertThatNoException().isThrownBy(() -> new ExtendedBeanInfo(Introspector.getBeanInfo(BigDecimal.class)));
} }
@Test @Test
public void subclassWriteMethodWithCovariantReturnType() throws IntrospectionException { void subclassWriteMethodWithCovariantReturnType() throws Exception {
@SuppressWarnings("unused") class B { @SuppressWarnings("unused") class B {
public String getFoo() { return null; } public String getFoo() { return null; }
public Number setFoo(String foo) { return null; } public Number setFoo(String foo) { return null; }
@ -597,9 +582,6 @@ public class ExtendedBeanInfoTests {
BeanInfo ebi = new ExtendedBeanInfo(bi); BeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(hasReadMethodForProperty(bi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(bi, "foo")).isFalse();
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
@ -607,7 +589,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void nonStandardReadMethodAndStandardWriteMethod() throws IntrospectionException { void nonStandardReadMethodAndStandardWriteMethod() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public void getFoo() { } public void getFoo() { }
public void setFoo(String foo) { } public void setFoo(String foo) { }
@ -628,7 +610,7 @@ public class ExtendedBeanInfoTests {
* could occur when handling ArrayList.set(int,Object) * could occur when handling ArrayList.set(int,Object)
*/ */
@Test @Test
public void emptyPropertiesIgnored() throws IntrospectionException { void emptyPropertiesIgnored() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Object set(Object o) { return null; } public Object set(Object o) { return null; }
public Object set(int i, Object o) { return null; } public Object set(int i, Object o) { return null; }
@ -641,7 +623,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void overloadedNonStandardWriteMethodsOnly_orderA() throws IntrospectionException, SecurityException, NoSuchMethodException { void overloadedNonStandardWriteMethodsOnly_orderA() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Object setFoo(String p) { return new Object(); } public Object setFoo(String p) { return new Object(); }
public Object setFoo(int p) { return new Object(); } public Object setFoo(int p) { return new Object(); }
@ -653,9 +635,6 @@ public class ExtendedBeanInfoTests {
BeanInfo ebi = new ExtendedBeanInfo(bi); BeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(hasReadMethodForProperty(bi, "foo")).isFalse();
assertThat(hasWriteMethodForProperty(bi, "foo")).isFalse();
assertThat(hasReadMethodForProperty(ebi, "foo")).isFalse(); assertThat(hasReadMethodForProperty(ebi, "foo")).isFalse();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
@ -669,7 +648,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void overloadedNonStandardWriteMethodsOnly_orderB() throws IntrospectionException, SecurityException, NoSuchMethodException { void overloadedNonStandardWriteMethodsOnly_orderB() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Object setFoo(int p) { return new Object(); } public Object setFoo(int p) { return new Object(); }
public Object setFoo(String p) { return new Object(); } public Object setFoo(String p) { return new Object(); }
@ -681,9 +660,6 @@ public class ExtendedBeanInfoTests {
BeanInfo ebi = new ExtendedBeanInfo(bi); BeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(hasReadMethodForProperty(bi, "foo")).isFalse();
assertThat(hasWriteMethodForProperty(bi, "foo")).isFalse();
assertThat(hasReadMethodForProperty(ebi, "foo")).isFalse(); assertThat(hasReadMethodForProperty(ebi, "foo")).isFalse();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue(); assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
@ -704,7 +680,7 @@ public class ExtendedBeanInfoTests {
* not actually intended to serve as an indexed write method; it just appears that way. * not actually intended to serve as an indexed write method; it just appears that way.
*/ */
@Test @Test
public void reproSpr8522() throws IntrospectionException { void reproSpr8522() throws Exception {
@SuppressWarnings("unused") class C { @SuppressWarnings("unused") class C {
public Object setDateFormat(String pattern) { return new Object(); } public Object setDateFormat(String pattern) { return new Object(); }
public Object setDateFormat(int style) { return new Object(); } public Object setDateFormat(int style) { return new Object(); }
@ -731,7 +707,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void propertyCountsMatch() throws IntrospectionException { void propertyCountsMatch() throws Exception {
BeanInfo bi = Introspector.getBeanInfo(TestBean.class); BeanInfo bi = Introspector.getBeanInfo(TestBean.class);
BeanInfo ebi = new ExtendedBeanInfo(bi); BeanInfo ebi = new ExtendedBeanInfo(bi);
@ -739,7 +715,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void propertyCountsWithNonStandardWriteMethod() throws IntrospectionException { void propertyCountsWithNonStandardWriteMethod() throws Exception {
class ExtendedTestBean extends TestBean { class ExtendedTestBean extends TestBean {
@SuppressWarnings("unused") @SuppressWarnings("unused")
public ExtendedTestBean setFoo(String s) { return this; } public ExtendedTestBean setFoo(String s) { return this; }
@ -763,7 +739,7 @@ public class ExtendedBeanInfoTests {
* Test that {@link ExtendedBeanInfo#getPropertyDescriptors()} does the same. * Test that {@link ExtendedBeanInfo#getPropertyDescriptors()} does the same.
*/ */
@Test @Test
public void propertyDescriptorOrderIsEqual() throws IntrospectionException { void propertyDescriptorOrderIsEqual() throws Exception {
BeanInfo bi = Introspector.getBeanInfo(TestBean.class); BeanInfo bi = Introspector.getBeanInfo(TestBean.class);
BeanInfo ebi = new ExtendedBeanInfo(bi); BeanInfo ebi = new ExtendedBeanInfo(bi);
@ -773,7 +749,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void propertyDescriptorComparator() throws IntrospectionException { void propertyDescriptorComparator() throws Exception {
ExtendedBeanInfo.PropertyDescriptorComparator c = new ExtendedBeanInfo.PropertyDescriptorComparator(); ExtendedBeanInfo.PropertyDescriptorComparator c = new ExtendedBeanInfo.PropertyDescriptorComparator();
assertThat(c.compare(new PropertyDescriptor("a", null, null), new PropertyDescriptor("a", null, null))).isEqualTo(0); assertThat(c.compare(new PropertyDescriptor("a", null, null), new PropertyDescriptor("a", null, null))).isEqualTo(0);
@ -792,7 +768,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void reproSpr8806() throws IntrospectionException { void reproSpr8806() throws Exception {
// does not throw // does not throw
Introspector.getBeanInfo(LawLibrary.class); Introspector.getBeanInfo(LawLibrary.class);
@ -801,7 +777,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void cornerSpr8949() throws IntrospectionException { void cornerSpr8949() throws Exception {
class A { class A {
@SuppressWarnings("unused") @SuppressWarnings("unused")
public boolean isTargetMethod() { public boolean isTargetMethod() {
@ -832,7 +808,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void cornerSpr8937AndSpr12582() throws IntrospectionException { void cornerSpr8937AndSpr12582() throws Exception {
@SuppressWarnings("unused") class A { @SuppressWarnings("unused") class A {
public void setAddress(String addr){ } public void setAddress(String addr){ }
public void setAddress(int index, String addr) { } public void setAddress(int index, String addr) { }
@ -855,7 +831,7 @@ public class ExtendedBeanInfoTests {
} }
@Test @Test
public void shouldSupportStaticWriteMethod() throws IntrospectionException { void shouldSupportStaticWriteMethod() throws Exception {
{ {
BeanInfo bi = Introspector.getBeanInfo(WithStaticWriteMethod.class); BeanInfo bi = Introspector.getBeanInfo(WithStaticWriteMethod.class);
assertThat(hasReadMethodForProperty(bi, "prop1")).isFalse(); assertThat(hasReadMethodForProperty(bi, "prop1")).isFalse();
@ -873,7 +849,7 @@ public class ExtendedBeanInfoTests {
} }
@Test // SPR-12434 @Test // SPR-12434
public void shouldDetectValidPropertiesAndIgnoreInvalidProperties() throws IntrospectionException { void shouldDetectValidPropertiesAndIgnoreInvalidProperties() throws Exception {
BeanInfo bi = new ExtendedBeanInfo(Introspector.getBeanInfo(java.awt.Window.class)); BeanInfo bi = new ExtendedBeanInfo(Introspector.getBeanInfo(java.awt.Window.class));
assertThat(hasReadMethodForProperty(bi, "locationByPlatform")).isTrue(); assertThat(hasReadMethodForProperty(bi, "locationByPlatform")).isTrue();
assertThat(hasWriteMethodForProperty(bi, "locationByPlatform")).isTrue(); assertThat(hasWriteMethodForProperty(bi, "locationByPlatform")).isTrue();