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

Moved SpringFactoriesLoader to io.support in order to resolve tangle.

Browse Source
This commit is contained in:
Arjen Poutsma
2012-09-10 11:28:45 +02:00
parent fc859ffd6e
commit aeff91c1da
7 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/test/java/org/springframework/core/DummyFactory.java → spring-core/src/test/java/org/springframework/core/io/support/DummyFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.core;
package org.springframework.core.io.support;
/**
* Used by {@link SpringFactoriesLoaderTests}

11
spring-core/src/test/java/org/springframework/core/MyDummyFactory1.java → spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java
View File

@@ -14,18 +14,17 @@
* limitations under the License.
*/
package org.springframework.core;
package org.springframework.core.io.support;
import org.springframework.core.annotation.Order;
/**
* Used by {@link SpringFactoriesLoaderTests}
*
* @author Arjen Poutsma
*/
public class MyDummyFactory1 implements DummyFactory, Ordered {
public int getOrder() {
return 1;
}
@Order(1)
public class MyDummyFactory1 implements DummyFactory {
public String getString() {
return "Foo";

13
spring-core/src/test/java/org/springframework/core/MyDummyFactory2.java → spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java
View File

@@ -14,18 +14,17 @@
* limitations under the License.
*/
package org.springframework.core;
package org.springframework.core.io.support;
import org.springframework.core.annotation.Order;
/**
* Used by {@link org.springframework.core.SpringFactoriesLoaderTests}
* Used by {@link SpringFactoriesLoaderTests}
*
* @author Arjen Poutsma
*/
public class MyDummyFactory2 implements DummyFactory, Ordered {
public int getOrder() {
return 2;
}
@Order(2)
public class MyDummyFactory2 implements DummyFactory {
public String getString() {
return "Bar";

10
spring-core/src/test/java/org/springframework/core/SpringFactoriesLoaderTests.java → spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.core;
package org.springframework.core.io.support;
import java.util.List;
@@ -25,11 +25,13 @@ import org.junit.Test;
/** @author Arjen Poutsma */
public class SpringFactoriesLoaderTests {
private static final String FACTORIES_LOCATION =
"org/springframework/core/io/support/springFactoriesLoaderTests.properties";
@Test
public void loadFactories() {
List<DummyFactory> factories = SpringFactoriesLoader
.loadFactories(DummyFactory.class, null,
"org/springframework/core/springFactoriesLoaderTests.properties");
.loadFactories(DummyFactory.class, null, FACTORIES_LOCATION);
assertEquals(2, factories.size());
assertTrue(factories.get(0) instanceof MyDummyFactory1);
@@ -39,7 +41,7 @@ public class SpringFactoriesLoaderTests {
@Test(expected = IllegalArgumentException.class)
public void loadInvalid() {
SpringFactoriesLoader.loadFactories(String.class, null,
"org/springframework/core/springFactoriesLoaderTests.properties");
FACTORIES_LOCATION);
}
}

2
spring-core/src/test/resources/org/springframework/core/io/support/springFactoriesLoaderTests.properties Normal file
View File

@@ -0,0 +1,2 @@
org.springframework.core.io.support.DummyFactory=org.springframework.core.io.support.MyDummyFactory2,org.springframework.core.io.support.MyDummyFactory1
java.lang.String=org.springframework.core.io.support.MyDummyFactory1

2
spring-core/src/test/resources/org/springframework/core/springFactoriesLoaderTests.properties
View File

@@ -1,2 +0,0 @@
org.springframework.core.DummyFactory=org.springframework.core.MyDummyFactory2,org.springframework.core.MyDummyFactory1
java.lang.String=org.springframework.core.MyDummyFactory1