diff --git a/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java new file mode 100644 index 0000000000..216f905437 --- /dev/null +++ b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java @@ -0,0 +1,25 @@ +package org.baeldung.properties.external; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; + +@Configuration +@ComponentScan("org.baeldung.properties.core") +@PropertySource("classpath:foo.properties") +public class ExternalPropertiesWithJavaConfig { + + public ExternalPropertiesWithJavaConfig() { + super(); + } + + // beans + + @Bean + public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + return new PropertySourcesPlaceholderConfigurer(); + } + +} \ No newline at end of file diff --git a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfig.java b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java similarity index 78% rename from spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfig.java rename to spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java index aa8017f98d..ea5bbf1c4d 100644 --- a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfig.java +++ b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java @@ -7,9 +7,9 @@ import org.springframework.context.annotation.ImportResource; @Configuration @ImportResource("classpath:configForProperties.xml") @ComponentScan("org.baeldung.core") -public class PropertiesWithXmlConfig { +public class ExternalPropertiesWithXmlConfig { - public PropertiesWithXmlConfig() { + public ExternalPropertiesWithXmlConfig() { super(); } diff --git a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigOne.java b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java similarity index 78% rename from spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigOne.java rename to spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java index 474ee234ea..2698937e1e 100644 --- a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigOne.java +++ b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java @@ -7,9 +7,9 @@ import org.springframework.context.annotation.ImportResource; @Configuration @ImportResource("classpath:configForPropertiesOne.xml") @ComponentScan("org.baeldung.core") -public class PropertiesWithXmlConfigOne { +public class ExternalPropertiesWithXmlConfigOne { - public PropertiesWithXmlConfigOne() { + public ExternalPropertiesWithXmlConfigOne() { super(); } diff --git a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigTwo.java b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java similarity index 72% rename from spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigTwo.java rename to spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java index a8588a00b7..efbb995b73 100644 --- a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithXmlConfigTwo.java +++ b/spring-all/src/main/java/org/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java @@ -5,9 +5,9 @@ import org.springframework.context.annotation.ImportResource; @Configuration @ImportResource("classpath:basicConfigForPropertiesTwo.xml") -public class PropertiesWithXmlConfigTwo { +public class ExternalPropertiesWithXmlConfigTwo { - public PropertiesWithXmlConfigTwo() { + public ExternalPropertiesWithXmlConfigTwo() { super(); } 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 index 1357d56090..25bfaa20a9 100644 --- a/spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java +++ b/spring-all/src/main/java/org/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java @@ -1,9 +1,7 @@ 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") @@ -13,11 +11,4 @@ public class BasicPropertiesWithJavaConfig { super(); } - // beans - - @Bean - public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - return new PropertySourcesPlaceholderConfigurer(); - } - } \ No newline at end of file diff --git a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithJavaConfig.java b/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java similarity index 80% rename from spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithJavaConfig.java rename to spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java index 1d6272315d..08626bb4d2 100644 --- a/spring-all/src/main/java/org/baeldung/properties/external/PropertiesWithJavaConfig.java +++ b/spring-all/src/main/java/org/baeldung/properties/spring/PropertiesWithJavaConfig.java @@ -1,13 +1,11 @@ -package org.baeldung.properties.external; +package org.baeldung.properties.spring; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; @Configuration -@ComponentScan("org.baeldung.properties.core") @PropertySource("classpath:foo.properties") public class PropertiesWithJavaConfig { diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java new file mode 100644 index 0000000000..049b0d546a --- /dev/null +++ b/spring-all/src/test/java/org/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java @@ -0,0 +1,29 @@ +package org.baeldung.properties.basic; + +import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.env.Environment; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class) +public class BasicPropertiesWithJavaIntegrationTest { + + @Autowired + private Environment env; + + @Value("${key.something}") + private String injectedProperty; + + @Test + public final void givenContextIsInitialized_thenNoException() { + System.out.println("in test via @Value: " + injectedProperty); + System.out.println("in test Environment: " + env.getProperty("key.something")); + } + +} diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java new file mode 100644 index 0000000000..28ef76e249 --- /dev/null +++ b/spring-all/src/test/java/org/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java @@ -0,0 +1,30 @@ +package org.baeldung.properties.basic; + +import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig; +import org.baeldung.properties.spring.PropertiesWithJavaConfigOther; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.env.Environment; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class) +public class ExtendedPropertiesWithJavaIntegrationTest { + + @Autowired + private Environment env; + + @Value("${key.something}") + private String injectedProperty; + + @Test + public final void givenContextIsInitialized_thenNoException() { + System.out.println("in test via @Value: " + injectedProperty); + System.out.println("in test Environment: " + env.getProperty("key.something")); + } + +} diff --git a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java b/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java index d7c4739951..c55c1ee783 100644 --- a/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java @@ -1,7 +1,6 @@ package org.baeldung.properties.basic; -import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig; -import org.baeldung.properties.spring.PropertiesWithJavaConfigOther; +import org.baeldung.properties.spring.PropertiesWithJavaConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class) +@ContextConfiguration(classes = { PropertiesWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class) public class PropertiesWithJavaIntegrationTest { @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 068198fce2..c38a4b5465 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 @@ -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 = { ExternalPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class) @Ignore("manual only") public class ExternalPropertiesWithJavaIntegrationTest { 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 0b41117386..fe96ea8f7f 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 @@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PropertiesWithXmlConfigOne.class, PropertiesWithXmlConfigTwo.class }, loader = AnnotationConfigContextLoader.class) +@ContextConfiguration(classes = { ExternalPropertiesWithXmlConfigOne.class, ExternalPropertiesWithXmlConfigTwo.class }, loader = AnnotationConfigContextLoader.class) @Ignore("manual only") public class ExternalPropertiesWithMultipleXmlsIntegrationTest { 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 679e8761c4..2ea2822b9a 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 @@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PropertiesWithXmlConfig.class }, loader = AnnotationConfigContextLoader.class) +@ContextConfiguration(classes = { ExternalPropertiesWithXmlConfig.class }, loader = AnnotationConfigContextLoader.class) @Ignore("manual only") public class ExternalPropertiesWithXmlIntegrationTest { 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 d217dbf4ec..f9845f42a7 100644 --- a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java +++ b/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java @@ -1,6 +1,6 @@ package org.baeldung.test; -import org.baeldung.properties.basic.PropertiesWithJavaIntegrationTest; +import org.baeldung.properties.basic.ExtendedPropertiesWithJavaIntegrationTest; import org.baeldung.properties.basic.PropertiesWithMultipleXmlsIntegrationTest; import org.baeldung.properties.basic.PropertiesWithXmlIntegrationTest; import org.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest; @@ -16,7 +16,7 @@ import org.junit.runners.Suite.SuiteClasses; ExternalPropertiesWithJavaIntegrationTest.class, ExternalPropertiesWithMultipleXmlsIntegrationTest.class, ExternalPropertiesWithXmlIntegrationTest.class, - PropertiesWithJavaIntegrationTest.class, + ExtendedPropertiesWithJavaIntegrationTest.class, PropertiesWithMultipleXmlsIntegrationTest.class, })// @formatter:on public final class IntegrationTestSuite {