From 7243b16d4926763a5feae5aeee6b7fb466b9cf4c Mon Sep 17 00:00:00 2001 From: eugenp Date: Sat, 15 Aug 2015 18:14:55 +0300 Subject: [PATCH] work on properties --- .../PropertiesWithJavaConfig.java | 2 +- .../PropertiesWithXmlConfig.java | 2 +- .../PropertiesWithXmlConfigOne.java | 2 +- .../PropertiesWithXmlConfigTwo.java | 2 +- .../spring/BasicPropertiesWithJavaConfig.java | 23 +++++++++++++++++++ .../resources/basicConfigForPropertiesOne.xml | 12 ++++++++++ .../PropertiesWithJavaIntegrationTest.java | 6 ++--- ...ertiesWithMultipleXmlsIntegrationTest.java | 2 +- ...rnalPropertiesWithJavaIntegrationTest.java | 1 - ...ertiesWithMultipleXmlsIntegrationTest.java | 2 -- ...ernalPropertiesWithXmlIntegrationTest.java | 1 - .../baeldung/test/IntegrationTestSuite.java | 2 +- 12 files changed, 44 insertions(+), 13 deletions(-) rename spring-all/src/main/java/org/baeldung/properties/{spring => external}/PropertiesWithJavaConfig.java (94%) rename spring-all/src/main/java/org/baeldung/properties/{spring => external}/PropertiesWithXmlConfig.java (90%) rename spring-all/src/main/java/org/baeldung/properties/{spring => external}/PropertiesWithXmlConfigOne.java (90%) rename spring-all/src/main/java/org/baeldung/properties/{spring => external}/PropertiesWithXmlConfigTwo.java (87%) create mode 100644 spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java create mode 100644 spring-all/src/main/resources/basicConfigForPropertiesOne.xml rename spring-all/src/test/java/org/baeldung/properties/{core => basic}/PropertiesWithJavaIntegrationTest.java (78%) diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithJavaConfig.java similarity index 94% rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java rename to spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithJavaConfig.java index 9b5d7ed047..1d6272315d 100644 --- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java +++ b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithJavaConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.properties.spring; +package org.baeldung.properties.external; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfig.java similarity index 90% rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java rename to spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfig.java index 9ad7febcb0..aa8017f98d 100644 --- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfig.java +++ b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.properties.spring; +package org.baeldung.properties.external; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigOne.java similarity index 90% rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java rename to spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigOne.java index 9061cc10d4..474ee234ea 100644 --- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigOne.java +++ b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigOne.java @@ -1,4 +1,4 @@ -package org.baeldung.properties.spring; +package org.baeldung.properties.external; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigTwo.java similarity index 87% rename from spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java rename to spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigTwo.java index 87dbee3696..a8588a00b7 100644 --- a/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithXmlConfigTwo.java +++ b/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigTwo.java @@ -1,4 +1,4 @@ -package org.baeldung.properties.spring; +package org.baeldung.properties.external; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; diff --git a/spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java new file mode 100644 index 0000000000..1357d56090 --- /dev/null +++ b/spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java @@ -0,0 +1,23 @@ +package org.baeldung.properties.spring; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; + +@Configuration +@PropertySource("classpath:foo.properties") +public class BasicPropertiesWithJavaConfig { + + public BasicPropertiesWithJavaConfig() { + super(); + } + + // beans + + @Bean + public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + return new PropertySourcesPlaceholderConfigurer(); + } + +} \ No newline at end of file diff --git a/spring-all/src/main/resources/basicConfigForPropertiesOne.xml b/spring-all/src/main/resources/basicConfigForPropertiesOne.xml new file mode 100644 index 0000000000..4301b1faf9 --- /dev/null +++ b/spring-all/src/main/resources/basicConfigForPropertiesOne.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithJavaIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java similarity index 78% rename from spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithJavaIntegrationTest.java rename to spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java index d6c99502d7..d7c4739951 100644 --- a/spring-all/src/test/java/org/baeldung/properties/core/PropertiesWithJavaIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung.properties.core; +package org.baeldung.properties.basic; -import org.baeldung.properties.spring.PropertiesWithJavaConfig; +import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig; import org.baeldung.properties.spring.PropertiesWithJavaConfigOther; import org.junit.Test; import org.junit.runner.RunWith; @@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class) +@ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class) public class PropertiesWithJavaIntegrationTest { @Autowired diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java index eddadd2aeb..461f86f559 100644 --- a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java @@ -9,7 +9,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "classpath:configForPropertiesOne.xml", "classpath:basicConfigForPropertiesTwo.xml" }) +@ContextConfiguration(locations = { "classpath:basicConfigForPropertiesOne.xml", "classpath:basicConfigForPropertiesTwo.xml" }) public class PropertiesWithMultipleXmlsIntegrationTest { @Autowired diff --git a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java index 880f9d0c54..068198fce2 100644 --- a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java @@ -1,6 +1,5 @@ package org.baeldung.properties.external; -import org.baeldung.properties.spring.PropertiesWithJavaConfig; import org.baeldung.properties.spring.PropertiesWithJavaConfigOther; import org.junit.Ignore; import org.junit.Test; diff --git a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java index 660bd9bc4e..0b41117386 100644 --- a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java @@ -1,7 +1,5 @@ package org.baeldung.properties.external; -import org.baeldung.properties.spring.PropertiesWithXmlConfigOne; -import org.baeldung.properties.spring.PropertiesWithXmlConfigTwo; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlIntegrationTest.java index 4a111a04dd..679e8761c4 100644 --- a/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/properties/external/ExternalPropertiesWithXmlIntegrationTest.java @@ -1,6 +1,5 @@ package org.baeldung.properties.external; -import org.baeldung.properties.spring.PropertiesWithXmlConfig; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java b/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java index d574ad2356..d217dbf4ec 100644 --- a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java +++ b/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java @@ -1,8 +1,8 @@ package org.baeldung.test; +import org.baeldung.properties.basic.PropertiesWithJavaIntegrationTest; import org.baeldung.properties.basic.PropertiesWithMultipleXmlsIntegrationTest; import org.baeldung.properties.basic.PropertiesWithXmlIntegrationTest; -import org.baeldung.properties.core.PropertiesWithJavaIntegrationTest; import org.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest; import org.baeldung.properties.external.ExternalPropertiesWithMultipleXmlsIntegrationTest; import org.baeldung.properties.external.ExternalPropertiesWithXmlIntegrationTest;