From 3539c9900a8ffabd26dce62e44ac812c8751ccda Mon Sep 17 00:00:00 2001 From: Justin Albano Date: Mon, 9 Dec 2019 21:54:17 -0500 Subject: [PATCH 1/6] BAEL-3290: Basic injection added --- .../baeldung/dependency/ioc/AppConfig.java | 23 +++++++++++++ .../com/baeldung/dependency/ioc/Item.java | 5 +++ .../baeldung/dependency/ioc/ItemImpl1.java | 5 +++ .../com/baeldung/dependency/ioc/Store.java | 23 +++++++++++++ spring-di/src/main/resources/ioc-context.xml | 33 +++++++++++++++++++ .../dependency/ioc/XmlAppConfigTest.java | 24 ++++++++++++++ 6 files changed, 113 insertions(+) create mode 100644 spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java create mode 100644 spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java create mode 100644 spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java create mode 100644 spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java create mode 100644 spring-di/src/main/resources/ioc-context.xml create mode 100644 spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java b/spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java new file mode 100644 index 0000000000..9eb668df6c --- /dev/null +++ b/spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java @@ -0,0 +1,23 @@ +package com.baeldung.dependency.ioc; + +import org.springframework.context.annotation.Bean; + +public class AppConfig { + + @Bean + public Item item1() { + return new ItemImpl1(); + } + + @Bean + public Store storeThroughConstructorInjection() { + return new Store(item1()); + } + + @Bean + public Store storeThroughSetterInjection() { + Store store = new Store(); + store.setItem(item1()); + return store; + } +} diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java b/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java new file mode 100644 index 0000000000..107560514f --- /dev/null +++ b/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java @@ -0,0 +1,5 @@ +package com.baeldung.dependency.ioc; + +public interface Item { + +} diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java b/spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java new file mode 100644 index 0000000000..877ccecb0a --- /dev/null +++ b/spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java @@ -0,0 +1,5 @@ +package com.baeldung.dependency.ioc; + +public class ItemImpl1 implements Item { + +} diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java b/spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java new file mode 100644 index 0000000000..e4ff03b30e --- /dev/null +++ b/spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java @@ -0,0 +1,23 @@ +package com.baeldung.dependency.ioc; + +import org.springframework.beans.factory.annotation.Autowired; + +public class Store { + + @Autowired + private Item item; + + public Store() {} + + public Store(Item item) { + this.item = item; + } + + public Item getItem() { + return item; + } + + public void setItem(Item item) { + this.item = item; + } +} diff --git a/spring-di/src/main/resources/ioc-context.xml b/spring-di/src/main/resources/ioc-context.xml new file mode 100644 index 0000000000..df1165f557 --- /dev/null +++ b/spring-di/src/main/resources/ioc-context.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java b/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java new file mode 100644 index 0000000000..c13074281f --- /dev/null +++ b/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java @@ -0,0 +1,24 @@ +package com.baeldung.dependency.ioc; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.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("classpath:/ioc-context.xml") +public class XmlAppConfigTest { + + @Autowired + @Qualifier("xml-store-by-constructor") + private Store storeByConstructorInjection; + + @Test + public void givenValidXmlConfig_WhenInjectStoreByConstructorInject_ThenBeanIsNotNull() { + assertNotNull(storeByConstructorInjection); + } +} From a96ad152232bcadcf21d7e2647b42b772d6ed0e2 Mon Sep 17 00:00:00 2001 From: Justin Albano Date: Tue, 10 Dec 2019 08:23:01 -0500 Subject: [PATCH 2/6] BAEL-3290: Added test cases to exercise DI configuration --- .../com/baeldung/dependency/ioc/Item.java | 5 -- .../ioc => org/baeldung/store}/AppConfig.java | 2 +- .../main/java/org/baeldung/store/Item.java | 5 ++ .../ioc => org/baeldung/store}/ItemImpl1.java | 2 +- .../ioc => org/baeldung/store}/Store.java | 2 +- spring-di/src/main/resources/ioc-context.xml | 2 +- .../dependency/ioc/XmlAppConfigTest.java | 24 ---------- .../org/baeldung/store/AppConfigUnitTest.java | 36 +++++++++++++++ .../baeldung/store/XmlAppConfigUnitTest.java | 46 +++++++++++++++++++ 9 files changed, 91 insertions(+), 33 deletions(-) delete mode 100644 spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java rename spring-di/src/main/java/{com/baeldung/dependency/ioc => org/baeldung/store}/AppConfig.java (91%) create mode 100644 spring-di/src/main/java/org/baeldung/store/Item.java rename spring-di/src/main/java/{com/baeldung/dependency/ioc => org/baeldung/store}/ItemImpl1.java (54%) rename spring-di/src/main/java/{com/baeldung/dependency/ioc => org/baeldung/store}/Store.java (90%) delete mode 100644 spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java create mode 100644 spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java create mode 100644 spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java b/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java deleted file mode 100644 index 107560514f..0000000000 --- a/spring-di/src/main/java/com/baeldung/dependency/ioc/Item.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.dependency.ioc; - -public interface Item { - -} diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java b/spring-di/src/main/java/org/baeldung/store/AppConfig.java similarity index 91% rename from spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java rename to spring-di/src/main/java/org/baeldung/store/AppConfig.java index 9eb668df6c..80b6733dff 100644 --- a/spring-di/src/main/java/com/baeldung/dependency/ioc/AppConfig.java +++ b/spring-di/src/main/java/org/baeldung/store/AppConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.dependency.ioc; +package org.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/org/baeldung/store/Item.java new file mode 100644 index 0000000000..1d7292fc35 --- /dev/null +++ b/spring-di/src/main/java/org/baeldung/store/Item.java @@ -0,0 +1,5 @@ +package org.baeldung.store; + +public interface Item { + +} diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java b/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java similarity index 54% rename from spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java rename to spring-di/src/main/java/org/baeldung/store/ItemImpl1.java index 877ccecb0a..8bda9f24c9 100644 --- a/spring-di/src/main/java/com/baeldung/dependency/ioc/ItemImpl1.java +++ b/spring-di/src/main/java/org/baeldung/store/ItemImpl1.java @@ -1,4 +1,4 @@ -package com.baeldung.dependency.ioc; +package org.baeldung.store; public class ItemImpl1 implements Item { diff --git a/spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java b/spring-di/src/main/java/org/baeldung/store/Store.java similarity index 90% rename from spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java rename to spring-di/src/main/java/org/baeldung/store/Store.java index e4ff03b30e..dcc2c3be48 100644 --- a/spring-di/src/main/java/com/baeldung/dependency/ioc/Store.java +++ b/spring-di/src/main/java/org/baeldung/store/Store.java @@ -1,4 +1,4 @@ -package com.baeldung.dependency.ioc; +package org.baeldung.store; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-di/src/main/resources/ioc-context.xml b/spring-di/src/main/resources/ioc-context.xml index df1165f557..4ea97fe644 100644 --- a/spring-di/src/main/resources/ioc-context.xml +++ b/spring-di/src/main/resources/ioc-context.xml @@ -8,7 +8,7 @@ - + diff --git a/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java b/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java deleted file mode 100644 index c13074281f..0000000000 --- a/spring-di/src/test/java/com/baeldung/dependency/ioc/XmlAppConfigTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.dependency.ioc; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import org.junit.jupiter.api.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("classpath:/ioc-context.xml") -public class XmlAppConfigTest { - - @Autowired - @Qualifier("xml-store-by-constructor") - private Store storeByConstructorInjection; - - @Test - public void givenValidXmlConfig_WhenInjectStoreByConstructorInject_ThenBeanIsNotNull() { - assertNotNull(storeByConstructorInjection); - } -} diff --git a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java new file mode 100644 index 0000000000..54c2bc0b34 --- /dev/null +++ b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java @@ -0,0 +1,36 @@ +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()); + } +} diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java new file mode 100644 index 0000000000..a032ae8df5 --- /dev/null +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java @@ -0,0 +1,46 @@ +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("classpath:/ioc-context.xml") +public class XmlAppConfigUnitTest { + + @Autowired + @Qualifier("xml-store-by-constructor") + private Store storeByConstructorInjection; + + @Autowired + @Qualifier("xml-store-by-setter") + private Store storeBySetterInjection; + + @Autowired + @Qualifier("xml-store-by-setter-lazy") + private Store storeBySetterInjectionLazy; + + @Test + public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() { + assertNotNull(storeByConstructorInjection); + assertNotNull(storeByConstructorInjection.getItem()); + } + + @Test + public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() { + assertNotNull(storeBySetterInjection); + assertNotNull(storeByConstructorInjection.getItem()); + } + + @Test + public void givenValidXmlConfig_WhenInjectStoreBySetterInjectionLazy_ThenBeanIsNotNull() { + assertNotNull(storeBySetterInjectionLazy); + assertNotNull(storeByConstructorInjection.getItem()); + } +} From 49b511d74a37851ea9593eda3e84f9cd3de6b35f Mon Sep 17 00:00:00 2001 From: Justin Albano Date: Tue, 10 Dec 2019 08:35:09 -0500 Subject: [PATCH 3/6] BAEL-3290: Added unit test for autowiring by type --- .../main/resources/ioc-context-by-type.xml | 14 ++++++++ spring-di/src/main/resources/ioc-context.xml | 5 +-- .../store/XmlAppConfigByTypeUnitTest.java | 32 +++++++++++++++++++ .../baeldung/store/XmlAppConfigUnitTest.java | 10 ++++++ 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 spring-di/src/main/resources/ioc-context-by-type.xml create mode 100644 spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java diff --git a/spring-di/src/main/resources/ioc-context-by-type.xml b/spring-di/src/main/resources/ioc-context-by-type.xml new file mode 100644 index 0000000000..39a21b6917 --- /dev/null +++ b/spring-di/src/main/resources/ioc-context-by-type.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ 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 4ea97fe644..47f7da8959 100644 --- a/spring-di/src/main/resources/ioc-context.xml +++ b/spring-di/src/main/resources/ioc-context.xml @@ -18,9 +18,10 @@ - + - + + diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java new file mode 100644 index 0000000000..2dd5f1fcb9 --- /dev/null +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java @@ -0,0 +1,32 @@ +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; + +/** + * Separate unit test class where only one Item object is available for + * autowiring. If the ioc-context.xml were used for autowiring by type, there + * would be multiple qualifying Item objects, causing a failure. + * + * @author Justin Albano + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration("classpath:/ioc-context-by-type.xml") +public class XmlAppConfigByTypeUnitTest { + + @Autowired + @Qualifier("xml-store-by-autowire-type") + private Store storeByAutowireInjectionByType; + + @Test + public void givenValidXmlConfig_WhenInjectStoreByAutowireInjectionByType_ThenBeanIsNotNull() { + assertNotNull(storeByAutowireInjectionByType); + assertNotNull(storeByAutowireInjectionByType.getItem()); + } +} diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java index a032ae8df5..79fabfd84e 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java @@ -21,6 +21,10 @@ public class XmlAppConfigUnitTest { @Autowired @Qualifier("xml-store-by-setter") private Store storeBySetterInjection; + + @Autowired + @Qualifier("xml-store-by-autowire-name") + private Store storeByAutowireInjectionByName; @Autowired @Qualifier("xml-store-by-setter-lazy") @@ -38,6 +42,12 @@ public class XmlAppConfigUnitTest { assertNotNull(storeByConstructorInjection.getItem()); } + @Test + public void givenValidXmlConfig_WhenInjectStoreByAutowireInjectionByName_ThenBeanIsNotNull() { + assertNotNull(storeByAutowireInjectionByName); + assertNotNull(storeByAutowireInjectionByName.getItem()); + } + @Test public void givenValidXmlConfig_WhenInjectStoreBySetterInjectionLazy_ThenBeanIsNotNull() { assertNotNull(storeBySetterInjectionLazy); From d746d0b74af4b22f508c271092fef7f57b1cdd32 Mon Sep 17 00:00:00 2001 From: Justin Albano Date: Wed, 11 Dec 2019 07:57:32 -0500 Subject: [PATCH 4/6] BAEL-3290: Corrected formatting and removed author line in class comment --- .../src/test/java/org/baeldung/store/AppConfigUnitTest.java | 1 - .../java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java | 2 -- .../src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java | 1 - 3 files changed, 4 deletions(-) diff --git a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java index 54c2bc0b34..3260114679 100644 --- a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java @@ -1,6 +1,5 @@ package org.baeldung.store; - import static org.junit.Assert.assertNotNull; import org.junit.Test; diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java index 2dd5f1fcb9..036399e537 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java @@ -13,8 +13,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * Separate unit test class where only one Item object is available for * autowiring. If the ioc-context.xml were used for autowiring by type, there * would be multiple qualifying Item objects, causing a failure. - * - * @author Justin Albano */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/ioc-context-by-type.xml") diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java index 79fabfd84e..2dd4d6ccd6 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java @@ -1,6 +1,5 @@ package org.baeldung.store; - import static org.junit.Assert.assertNotNull; import org.junit.Test; From 348d6386b00e94dc379986d5ed573e4ce79d4926 Mon Sep 17 00:00:00 2001 From: Justin Albano Date: Wed, 11 Dec 2019 08:01:53 -0500 Subject: [PATCH 5/6] Revert "BAEL-3290: Corrected formatting and removed author line in class comment" This reverts commit d746d0b74af4b22f508c271092fef7f57b1cdd32. --- .../src/test/java/org/baeldung/store/AppConfigUnitTest.java | 1 + .../java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java | 2 ++ .../src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java | 1 + 3 files changed, 4 insertions(+) diff --git a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java index 3260114679..54c2bc0b34 100644 --- a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java @@ -1,5 +1,6 @@ package org.baeldung.store; + import static org.junit.Assert.assertNotNull; import org.junit.Test; diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java index 036399e537..2dd5f1fcb9 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java @@ -13,6 +13,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * Separate unit test class where only one Item object is available for * autowiring. If the ioc-context.xml were used for autowiring by type, there * would be multiple qualifying Item objects, causing a failure. + * + * @author Justin Albano */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/ioc-context-by-type.xml") diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java index 2dd4d6ccd6..79fabfd84e 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java @@ -1,5 +1,6 @@ package org.baeldung.store; + import static org.junit.Assert.assertNotNull; import org.junit.Test; From 71ba4ca875eb2b7f2206389063b9141a944ae7d0 Mon Sep 17 00:00:00 2001 From: Justin Albano Date: Wed, 11 Dec 2019 08:26:29 -0500 Subject: [PATCH 6/6] BAEL-3290: Corrected formatting --- .../main/resources/ioc-context-by-type.xml | 12 ++--- spring-di/src/main/resources/ioc-context.xml | 48 +++++++++---------- .../org/baeldung/store/AppConfigUnitTest.java | 1 - .../store/XmlAppConfigByTypeUnitTest.java | 2 - .../baeldung/store/XmlAppConfigUnitTest.java | 1 - 5 files changed, 30 insertions(+), 34 deletions(-) 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 39a21b6917..1249ce51af 100644 --- a/spring-di/src/main/resources/ioc-context-by-type.xml +++ b/spring-di/src/main/resources/ioc-context-by-type.xml @@ -1,14 +1,14 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - + - - + + \ 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 47f7da8959..0e1d0ac29c 100644 --- a/spring-di/src/main/resources/ioc-context.xml +++ b/spring-di/src/main/resources/ioc-context.xml @@ -1,34 +1,34 @@ - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java index 54c2bc0b34..3260114679 100644 --- a/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/AppConfigUnitTest.java @@ -1,6 +1,5 @@ package org.baeldung.store; - import static org.junit.Assert.assertNotNull; import org.junit.Test; diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java index 2dd5f1fcb9..036399e537 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigByTypeUnitTest.java @@ -13,8 +13,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * Separate unit test class where only one Item object is available for * autowiring. If the ioc-context.xml were used for autowiring by type, there * would be multiple qualifying Item objects, causing a failure. - * - * @author Justin Albano */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:/ioc-context-by-type.xml") diff --git a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java index 79fabfd84e..2dd4d6ccd6 100644 --- a/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java +++ b/spring-di/src/test/java/org/baeldung/store/XmlAppConfigUnitTest.java @@ -1,6 +1,5 @@ package org.baeldung.store; - import static org.junit.Assert.assertNotNull; import org.junit.Test;