From 2f5370dea6d6a5eebb609645784817c1cb4ba806 Mon Sep 17 00:00:00 2001
From: Muhammed Almas <eralmas7@yahoo.com>
Date: Wed, 8 Nov 2017 12:54:37 +0530
Subject: [PATCH] Spring core xml (#2971)

* BAEL-1247 Spring XML injection.

* BAEL-1247 - updated test

* BAEL-1247 - updated test
---
 .../main/resources/com.baeldung.di.spring.xml |  8 +++---
 .../baeldung/di/spring/BeanInjectionTest.java | 28 +++++--------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/spring-core/src/main/resources/com.baeldung.di.spring.xml b/spring-core/src/main/resources/com.baeldung.di.spring.xml
index 9c44d911d1..e0c5d22abb 100644
--- a/spring-core/src/main/resources/com.baeldung.di.spring.xml
+++ b/spring-core/src/main/resources/com.baeldung.di.spring.xml
@@ -5,7 +5,7 @@
 
     <bean id="indexService" class="com.baeldung.di.spring.IndexService" />
     
-    <bean id="messageService" class="com.baeldung.di.spring.MessageService" scope="prototype">
+    <bean id="messageService" class="com.baeldung.di.spring.MessageService">
     	<constructor-arg value="${message.value}" />
     </bean>
     
@@ -29,15 +29,15 @@
     	<property name="service" ref="indexService" />
     </bean>
     
-    <bean id="indexAppWithStaticFactory" class="com.baeldung.di.spring.IndexApp" scope="prototype">
+    <bean id="indexAppWithStaticFactory" class="com.baeldung.di.spring.IndexApp">
     	<property name="service" ref="messageServiceFromStaticFactory" />
     </bean>
     
-    <bean id="indexAppWithFactoryMethod" class="com.baeldung.di.spring.IndexApp" scope="prototype">
+    <bean id="indexAppWithFactoryMethod" class="com.baeldung.di.spring.IndexApp">
     	<property name="service" ref="messageServiceFromInstanceFactory" />
     </bean>
     
-    <bean id="messageWorldApp" class="com.baeldung.di.spring.MessageApp" scope="prototype">
+    <bean id="messageWorldApp" class="com.baeldung.di.spring.MessageApp">
     	<constructor-arg ref="messageService" />
     </bean>
 </beans>
\ No newline at end of file
diff --git a/spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java
index 1d133faf63..1660b99726 100644
--- a/spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java
+++ b/spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java
@@ -15,31 +15,17 @@ public class BeanInjectionTest {
         applicationContext = new ClassPathXmlApplicationContext("com.baeldung.di.spring.xml");
     }
 
-    @Test
-    public void protoBean_getBean_returnsMultipleInstance() {
-        final MessageApp messageApp1 = applicationContext.getBean("messageWorldApp", MessageApp.class);
-        final MessageApp messageApp2 = applicationContext.getBean("messageWorldApp", MessageApp.class);
-        assertNotEquals(messageApp1, messageApp2);
-    }
-
-    @Test
-    public void protoFactoryMethod_getBean_returnsMultipleInstance() {
-        final IndexApp indexApp1 = applicationContext.getBean("indexAppWithFactoryMethod", IndexApp.class);
-        final IndexApp indexApp2 = applicationContext.getBean("indexAppWithFactoryMethod", IndexApp.class);
-        assertNotEquals(indexApp1, indexApp2);
-    }
-
-    @Test
-    public void protoStaticFactory_getBean_returnsMultipleInstance() {
-        final IndexApp indexApp1 = applicationContext.getBean("indexAppWithStaticFactory", IndexApp.class);
-        final IndexApp indexApp2 = applicationContext.getBean("indexAppWithStaticFactory", IndexApp.class);
-        assertNotEquals(indexApp1, indexApp2);
-    }
-
     @Test
     public void singletonBean_getBean_returnsSingleInstance() {
         final IndexApp indexApp1 = applicationContext.getBean("indexApp", IndexApp.class);
         final IndexApp indexApp2 = applicationContext.getBean("indexApp", IndexApp.class);
         assertEquals(indexApp1, indexApp2);
     }
+
+    @Test
+    public void getBean_returnsInstance() {
+        final IndexApp indexApp = applicationContext.getBean("indexApp", IndexApp.class);
+        assertNotNull(indexApp);
+    }
+
 }