diff --git a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
index 5f29d0333f..bf733b75f9 100644
--- a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
+++ b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
@@ -2,45 +2,30 @@ package org.baeldung.scopes;
import javax.annotation.Resource;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class ScopesController {
+ public static final Logger LOG = Logger.getLogger(ScopesController.class);
@Resource(name = "requestMessage")
- HelloMessageGenerator firstRequestMessage;
-
- @Resource(name = "requestMessage")
- HelloMessageGenerator secondRequestMessage;
+ HelloMessageGenerator requestMessage;
@Resource(name = "sessionMessage")
- HelloMessageGenerator firstSessionMessage;
-
- @Resource(name = "sessionMessage")
- HelloMessageGenerator secondSessionMessage;
+ HelloMessageGenerator sessionMessage;
@RequestMapping("/scopes")
- public String getScopes() {
+ public String getScopes(final Model model) {
+ LOG.info("Request Message:" + requestMessage.getMessage());
+ LOG.info("Session Message" + sessionMessage.getMessage());
+ requestMessage.setMessage("Good morning!");
+ sessionMessage.setMessage("Good afternoon!");
+ model.addAttribute("requestMessage", requestMessage.getMessage());
+ model.addAttribute("sessionMessage", sessionMessage.getMessage());
return "scopesExample";
}
- @RequestMapping("/scopes/firstRequest")
- public String getFirstRequest(final Model model) {
- firstRequestMessage.setMessage("Good morning!");
- firstSessionMessage.setMessage("Good afternoon!");
- model.addAttribute("requestMessage", firstRequestMessage.getMessage());
- model.addAttribute("sessionMessage", firstSessionMessage.getMessage());
- return "scopesFirstRequest";
- }
-
- @RequestMapping("/scopes/secondRequest")
- public String getSecondRequest(final Model model) {
- secondRequestMessage.setMessage("Good evening!");
- model.addAttribute("requestMessage", secondRequestMessage.getMessage());
- model.addAttribute("sessionMessage", secondSessionMessage.getMessage());
- return "scopesSecondRequest";
- }
-
}
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
index 1de7b32720..5a9b266388 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
@@ -1,6 +1,7 @@
package org.baeldung.spring.config;
import org.baeldung.scopes.HelloMessageGenerator;
+import org.baeldung.scopes.Person;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -42,4 +43,15 @@ public class ScopesConfig {
return new HelloMessageGenerator();
}
+ @Bean
+ @Scope("prototype")
+ public Person personPrototype() {
+ return new Person();
+ }
+
+ @Bean
+ @Scope("singleton")
+ public Person personSingleton() {
+ return new Person();
+ }
}
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
index 624ff46d5c..7974cf0220 100644
--- a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
+++ b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
@@ -4,7 +4,7 @@
Bean Scopes Examples
- First Request
- Second Request
+ Request Message: ${requestMessage }
+ Session Message: ${sessionMessage }