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

Detect Order on target class as well

Browse Source 
Previously, the `@Order` annotation was managed in an inconsistent way
when placed at the implementation level. For simple beans, it was
discovered properly but wasn't for beans requiring a proxy.

OrderComparator.SourceProvider now explicitly allows to return several
order sources; the default implementation returns not only the factory
method (if  any) but also the target class if it happens to be different
from the class of the bean.

Issue: SPR-12636
This commit is contained in:
Stephane Nicoll
2015-02-19 09:47:20 +01:00
parent f20a62408b
commit 1aec6a6cc2
4 changed files with 210 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
View File

@@ -18,43 +18,90 @@ package org.springframework.core;
import java.util.Comparator;
import junit.framework.TestCase;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
* Unit tests for the {@link OrderComparator} class.
*
* @author Rick Evans
* @author Stephane Nicoll
*/
public final class OrderComparatorTests extends TestCase {
public final class OrderComparatorTests {
private Comparator comparator;
private final OrderComparator comparator = new OrderComparator();
@Override
protected void setUp() throws Exception {
this.comparator = new OrderComparator();
}
public void testCompareOrderedInstancesBefore() throws Exception {
@Test
public void compareOrderedInstancesBefore() {
assertEquals(-1, this.comparator.compare(
new StubOrdered(100), new StubOrdered(2000)));
}
public void testCompareOrderedInstancesSame() throws Exception {
@Test
public void compareOrderedInstancesSame() {
assertEquals(0, this.comparator.compare(
new StubOrdered(100), new StubOrdered(100)));
}
public void testCompareOrderedInstancesAfter() throws Exception {
@Test
public void compareOrderedInstancesAfter() {
assertEquals(1, this.comparator.compare(
new StubOrdered(982300), new StubOrdered(100)));
}
public void testCompareTwoNonOrderedInstancesEndsUpAsSame() throws Exception {
@Test
public void compareTwoNonOrderedInstancesEndsUpAsSame() {
assertEquals(0, this.comparator.compare(new Object(), new Object()));
}
@Test
public void compareWithSimpleSourceProvider() {
Comparator<Object> customComparator = this.comparator.withSourceProvider(
new TestSourceProvider(5L, new StubOrdered(25)));
assertEquals(-1, customComparator.compare(new StubOrdered(10), 5L));
}
@Test
public void compareWithSourceProviderArray() {
Comparator<Object> customComparator = this.comparator.withSourceProvider(
new TestSourceProvider(5L, new Object[] {new StubOrdered(10), new StubOrdered(-25)}));
assertEquals(-1, customComparator.compare(5L, new Object()));
}
@Test
public void compareWithSourceProviderArrayNoMatch() {
Comparator<Object> customComparator = this.comparator.withSourceProvider(
new TestSourceProvider(5L, new Object[]{new Object(), new Object()}));
assertEquals(0, customComparator.compare(new Object(), 5L));
}
@Test
public void compareWithSourceProviderEmpty() {
Comparator<Object> customComparator = this.comparator.withSourceProvider(
new TestSourceProvider(50L, new Object()));
assertEquals(0, customComparator.compare(new Object(), 5L));
}
private static final class TestSourceProvider implements OrderComparator.OrderSourceProvider {
private final Object target;
private final Object orderSource;
public TestSourceProvider(Object target, Object orderSource) {
this.target = target;
this.orderSource = orderSource;
}
@Override
public Object getOrderSource(Object obj) {
if (target.equals(obj)) {
return orderSource;
}
return null;
}
}
private static final class StubOrdered implements Ordered {