From 6906bb047dde7a1be84b27fd6f6c907b4b443cc0 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Wed, 11 Mar 2020 21:09:04 +0100
Subject: [PATCH] JAVA-959: Migrate spring-di to com.baeldung

---
 .../baeldung/store/AppConfig.java             |  2 +-
 .../{org => com}/baeldung/store/Item.java     |  2 +-
 .../baeldung/store/ItemImpl1.java             |  2 +-
 .../{org => com}/baeldung/store/Store.java    |  2 +-
 .../main/resources/ioc-context-by-type.xml    |  4 +-
 spring-di/src/main/resources/ioc-context.xml  | 14 ++--
 .../baeldung/store/AppConfigUnitTest.java     | 70 +++++++++----------
 .../store/XmlAppConfigByTypeUnitTest.java     |  2 +-
 .../baeldung/store/XmlAppConfigUnitTest.java  |  2 +-
 9 files changed, 50 insertions(+), 50 deletions(-)
 rename spring-di/src/main/java/{org => com}/baeldung/store/AppConfig.java (93%)
 rename spring-di/src/main/java/{org => com}/baeldung/store/Item.java (50%)
 rename spring-di/src/main/java/{org => com}/baeldung/store/ItemImpl1.java (61%)
 rename spring-di/src/main/java/{org => com}/baeldung/store/Store.java (92%)
 rename spring-di/src/test/java/{org => com}/baeldung/store/AppConfigUnitTest.java (94%)
 rename spring-di/src/test/java/{org => com}/baeldung/store/XmlAppConfigByTypeUnitTest.java (97%)
 rename spring-di/src/test/java/{org => com}/baeldung/store/XmlAppConfigUnitTest.java (98%)

diff --git a/spring-di/src/main/java/org/baeldung/store/AppConfig.java b/spring-di/src/main/java/com/baeldung/store/AppConfig.java
similarity index 93%
rename from spring-di/src/main/java/org/baeldung/store/AppConfig.java
rename to spring-di/src/main/java/com/baeldung/store/AppConfig.java
index 80b6733dff..0debecfc47 100644
--- a/spring-di/src/main/java/org/baeldung/store/AppConfig.java
+++ b/spring-di/src/main/java/com/baeldung/store/AppConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 import org.springframework.context.annotation.Bean;
 
diff --git a/spring-di/src/main/java/org/baeldung/store/Item.java b/spring-di/src/main/java/com/baeldung/store/Item.java
similarity index 50%
rename from spring-di/src/main/java/org/baeldung/store/Item.java
rename to spring-di/src/main/java/com/baeldung/store/Item.java
index 1d7292fc35..8598c2e1b3 100644
--- a/spring-di/src/main/java/org/baeldung/store/Item.java
+++ b/spring-di/src/main/java/com/baeldung/store/Item.java
@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 public interface Item {
 
diff --git a/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java b/spring-di/src/main/java/com/baeldung/store/ItemImpl1.java
similarity index 61%
rename from spring-di/src/main/java/org/baeldung/store/ItemImpl1.java
rename to spring-di/src/main/java/com/baeldung/store/ItemImpl1.java
index 8bda9f24c9..516882c99f 100644
--- a/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java
+++ b/spring-di/src/main/java/com/baeldung/store/ItemImpl1.java
@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 public class ItemImpl1 implements Item {
 
diff --git a/spring-di/src/main/java/org/baeldung/store/Store.java b/spring-di/src/main/java/com/baeldung/store/Store.java
similarity index 92%
rename from spring-di/src/main/java/org/baeldung/store/Store.java
rename to spring-di/src/main/java/com/baeldung/store/Store.java
index dcc2c3be48..cc40f74306 100644
--- a/spring-di/src/main/java/org/baeldung/store/Store.java
+++ b/spring-di/src/main/java/com/baeldung/store/Store.java
@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/spring-di/src/main/resources/ioc-context-by-type.xml b/spring-di/src/main/resources/ioc-context-by-type.xml
index 1249ce51af..cba8b17a30 100644
--- a/spring-di/src/main/resources/ioc-context-by-type.xml
+++ b/spring-di/src/main/resources/ioc-context-by-type.xml
@@ -6,9 +6,9 @@
     
 	<!-- Autowired injection -->
 
-    <bean id="item" class="org.baeldung.store.ItemImpl1" />
+    <bean id="item" class="com.baeldung.store.ItemImpl1" />
 	
-    <bean id="xml-store-by-autowire-type" class="org.baeldung.store.Store" autowire="byType">
+    <bean id="xml-store-by-autowire-type" class="com.baeldung.store.Store" autowire="byType">
     </bean>
 
 </beans>
\ No newline at end of file
diff --git a/spring-di/src/main/resources/ioc-context.xml b/spring-di/src/main/resources/ioc-context.xml
index 0e1d0ac29c..64b1bc5443 100644
--- a/spring-di/src/main/resources/ioc-context.xml
+++ b/spring-di/src/main/resources/ioc-context.xml
@@ -6,28 +6,28 @@
     
     <!-- Constructor injection -->
 
-    <bean id="item1" class="org.baeldung.store.ItemImpl1" />
-    <bean id="xml-store-by-constructor" class="org.baeldung.store.Store">
+    <bean id="item1" class="com.baeldung.store.ItemImpl1" />
+    <bean id="xml-store-by-constructor" class="com.baeldung.store.Store">
         <constructor-arg type="Item" index="0"    name="item" ref="item1" />
     </bean>
     
     <!-- Setter injection -->
 
-    <bean id="xml-store-by-setter" class="org.baeldung.store.Store">
+    <bean id="xml-store-by-setter" class="com.baeldung.store.Store">
         <property name="item" ref="item1" />
     </bean>
     
     <!-- Autowired injection -->
     
-    <bean id="item" class="org.baeldung.store.ItemImpl1" />
+    <bean id="item" class="com.baeldung.store.ItemImpl1" />
 
-    <bean id="xml-store-by-autowire-name" class="org.baeldung.store.Store" autowire="byName">
+    <bean id="xml-store-by-autowire-name" class="com.baeldung.store.Store" autowire="byName">
     </bean>
     
     <!-- Lazy instantiation -->
     
-    <bean id="item1-lazy" class="org.baeldung.store.ItemImpl1" lazy-init="true" />
-    <bean id="xml-store-by-setter-lazy" class="org.baeldung.store.Store">
+    <bean id="item1-lazy" class="com.baeldung.store.ItemImpl1" lazy-init="true" />
+    <bean id="xml-store-by-setter-lazy" class="com.baeldung.store.Store">
         <property name="item" ref="item1-lazy" />
     </bean>
 
diff --git a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java b/spring-di/src/test/java/com/baeldung/store/AppConfigUnitTest.java
similarity index 94%
rename from spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java
rename to spring-di/src/test/java/com/baeldung/store/AppConfigUnitTest.java
index 3260114679..d433ac6bf0 100644
--- a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java
+++ b/spring-di/src/test/java/com/baeldung/store/AppConfigUnitTest.java
@@ -1,35 +1,35 @@
-package org.baeldung.store;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AppConfig.class)
-public class AppConfigUnitTest {
-
-    @Autowired
-    @Qualifier("storeThroughConstructorInjection")
-    private Store storeByConstructorInjection;
-    
-    @Autowired
-    @Qualifier("storeThroughSetterInjection")
-    private Store storeBySetterInjection;
-
-    @Test
-    public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() {
-        assertNotNull(storeByConstructorInjection);
-        assertNotNull(storeByConstructorInjection.getItem());
-    }
-
-    @Test
-    public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() {
-        assertNotNull(storeBySetterInjection);
-        assertNotNull(storeByConstructorInjection.getItem());
-    }
-}
+package com.baeldung.store;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfig.class)
+public class AppConfigUnitTest {
+
+    @Autowired
+    @Qualifier("storeThroughConstructorInjection")
+    private Store storeByConstructorInjection;
+    
+    @Autowired
+    @Qualifier("storeThroughSetterInjection")
+    private Store storeBySetterInjection;
+
+    @Test
+    public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() {
+        assertNotNull(storeByConstructorInjection);
+        assertNotNull(storeByConstructorInjection.getItem());
+    }
+
+    @Test
+    public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() {
+        assertNotNull(storeBySetterInjection);
+        assertNotNull(storeByConstructorInjection.getItem());
+    }
+}
diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigByTypeUnitTest.java
similarity index 97%
rename from spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java
rename to spring-di/src/test/java/com/baeldung/store/XmlAppConfigByTypeUnitTest.java
index 036399e537..dbed822e46 100644
--- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java
+++ b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigByTypeUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 import static org.junit.Assert.assertNotNull;
 
diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigUnitTest.java
similarity index 98%
rename from spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java
rename to spring-di/src/test/java/com/baeldung/store/XmlAppConfigUnitTest.java
index 2dd4d6ccd6..90c55c263c 100644
--- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java
+++ b/spring-di/src/test/java/com/baeldung/store/XmlAppConfigUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 import static org.junit.Assert.assertNotNull;