persistence work

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();
+    }
+
+}

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();
     }
 

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();
     }
 

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();
     }
 

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();
-    }
-
 }

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 {
 

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"));
+    }
+
+}

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"));
+    }
+
+}

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

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 {
 

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 {
 

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 {
 

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 {