From 699bf2e3808c7c23ff7ee2ebedaea225518d349e Mon Sep 17 00:00:00 2001 From: stvort Date: Wed, 15 Feb 2023 19:19:24 +0400 Subject: [PATCH] 2023-01 spring-06-bean-scopes-and-lifecycle updated --- .../controllers/GreetingController.java | 12 +++++++----- .../services/PrototypeGreetingServiceImpl.java | 2 +- .../services/RequestGreetingServiceImpl.java | 2 +- .../services/SessionGreetingServiceImpl.java | 2 +- .../services/SingletonGreetingServiceImpl.java | 2 +- .../controllers/GreetingController.java | 12 +++++++----- .../services/PrototypeGreetingServiceImpl.java | 2 +- .../services/RequestGreetingServiceImpl.java | 2 +- .../services/SessionGreetingServiceImpl.java | 2 +- .../services/SingletonGreetingServiceImpl.java | 2 +- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java index 142fce6e..6bfc91c1 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java @@ -14,11 +14,13 @@ public class GreetingController { private final GreetingService sessionGreetingService; private final GreetingService requestGreetingService; - public GreetingController(@Qualifier("SingletonGreetingService") GreetingService singletonGreetingService, - @Qualifier("PrototypeGreetingService")GreetingService prototypeGreetingService1, - @Qualifier("PrototypeGreetingService")GreetingService prototypeGreetingService2, - @Qualifier("SessionGreetingService")GreetingService sessionGreetingService, - @Qualifier("RequestGreetingService")GreetingService requestGreetingService + public GreetingController(GreetingService singletonGreetingService, + @Qualifier("prototypeGreetingService") + GreetingService prototypeGreetingService1, + @Qualifier("prototypeGreetingService") + GreetingService prototypeGreetingService2, + GreetingService sessionGreetingService, + GreetingService requestGreetingService ) { this.singletonGreetingService = singletonGreetingService; this.prototypeGreetingService1 = prototypeGreetingService1; diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java index 73ebdcd6..cb30816b 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java @@ -2,6 +2,6 @@ package ru.otus.example.beansscopesdemo.services; import org.springframework.stereotype.Service; -@Service("PrototypeGreetingService") +@Service("prototypeGreetingService") public class PrototypeGreetingServiceImpl extends AbstractGreetingServiceImpl { } diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java index 4340188e..0631f2da 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java @@ -2,6 +2,6 @@ package ru.otus.example.beansscopesdemo.services; import org.springframework.stereotype.Service; -@Service("RequestGreetingService") +@Service("requestGreetingService") public class RequestGreetingServiceImpl extends AbstractGreetingServiceImpl { } diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java index 045b0b5a..47ea143c 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java @@ -2,6 +2,6 @@ package ru.otus.example.beansscopesdemo.services; import org.springframework.stereotype.Service; -@Service("SessionGreetingService") +@Service("sessionGreetingService") public class SessionGreetingServiceImpl extends AbstractGreetingServiceImpl { } diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java index b2f792a1..70b6a266 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-exercise/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java @@ -2,6 +2,6 @@ package ru.otus.example.beansscopesdemo.services; import org.springframework.stereotype.Service; -@Service("SingletonGreetingService") +@Service("singletonGreetingService") public class SingletonGreetingServiceImpl extends AbstractGreetingServiceImpl { } diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java index 142fce6e..6bfc91c1 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/controllers/GreetingController.java @@ -14,11 +14,13 @@ public class GreetingController { private final GreetingService sessionGreetingService; private final GreetingService requestGreetingService; - public GreetingController(@Qualifier("SingletonGreetingService") GreetingService singletonGreetingService, - @Qualifier("PrototypeGreetingService")GreetingService prototypeGreetingService1, - @Qualifier("PrototypeGreetingService")GreetingService prototypeGreetingService2, - @Qualifier("SessionGreetingService")GreetingService sessionGreetingService, - @Qualifier("RequestGreetingService")GreetingService requestGreetingService + public GreetingController(GreetingService singletonGreetingService, + @Qualifier("prototypeGreetingService") + GreetingService prototypeGreetingService1, + @Qualifier("prototypeGreetingService") + GreetingService prototypeGreetingService2, + GreetingService sessionGreetingService, + GreetingService requestGreetingService ) { this.singletonGreetingService = singletonGreetingService; this.prototypeGreetingService1 = prototypeGreetingService1; diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java index 5ea82da6..6b29df8d 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/PrototypeGreetingServiceImpl.java @@ -5,6 +5,6 @@ import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.stereotype.Service; @Scope(scopeName = "prototype") -@Service("PrototypeGreetingService") +@Service("prototypeGreetingService") public class PrototypeGreetingServiceImpl extends AbstractGreetingServiceImpl { } diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java index a1559ea3..a216003d 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/RequestGreetingServiceImpl.java @@ -6,6 +6,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.context.WebApplicationContext; @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES) -@Service("RequestGreetingService") +@Service("requestGreetingService") public class RequestGreetingServiceImpl extends AbstractGreetingServiceImpl { } diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java index e9ad2d8e..35e17d21 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SessionGreetingServiceImpl.java @@ -6,6 +6,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.context.WebApplicationContext; @Scope(value = "session", proxyMode = ScopedProxyMode.INTERFACES) -@Service("SessionGreetingService") +@Service("sessionGreetingService") public class SessionGreetingServiceImpl extends AbstractGreetingServiceImpl { } diff --git a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java index fb8406a5..4c9825da 100644 --- a/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java +++ b/2023-01/spring-06-bean-scopes-and-lifecycle/beans-scopes-solution/src/main/java/ru/otus/example/beansscopesdemo/services/SingletonGreetingServiceImpl.java @@ -4,6 +4,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @Scope("singleton") -@Service("SingletonGreetingService") +@Service("singletonGreetingService") public class SingletonGreetingServiceImpl extends AbstractGreetingServiceImpl { }