From bbbb6e6e4fa9dced1734386c20b333767fe726a9 Mon Sep 17 00:00:00 2001 From: petrelevich Date: Sun, 9 Apr 2023 23:07:37 +0300 Subject: [PATCH] L05-springBoot --- .../src/main/java/ru/otus/SpringBootDemo.java | 2 -- .../service/GreetingServiceServiceImpl.java | 17 ++++++++++++++++- .../main/java/ru/otus/service/LocalHello.java | 7 +------ .../src/main/resources/application.yml | 9 --------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/2023-03/spring-05-springBoot/src/main/java/ru/otus/SpringBootDemo.java b/2023-03/spring-05-springBoot/src/main/java/ru/otus/SpringBootDemo.java index 996a8eda..63da3f54 100644 --- a/2023-03/spring-05-springBoot/src/main/java/ru/otus/SpringBootDemo.java +++ b/2023-03/spring-05-springBoot/src/main/java/ru/otus/SpringBootDemo.java @@ -3,8 +3,6 @@ package ru.otus; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -//http://localhost:8080/actuator/health - @SpringBootApplication public class SpringBootDemo { diff --git a/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/GreetingServiceServiceImpl.java b/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/GreetingServiceServiceImpl.java index 8501ceae..95a01686 100644 --- a/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/GreetingServiceServiceImpl.java +++ b/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/GreetingServiceServiceImpl.java @@ -1,17 +1,32 @@ package ru.otus.service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.MessageSource; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; +import ru.otus.configs.AppProps; @Service public class GreetingServiceServiceImpl implements GreetingService { + private static final Logger logger = LoggerFactory.getLogger(GreetingServiceServiceImpl.class); + private final MessageSource messageSource; + private final AppProps props; + + public GreetingServiceServiceImpl(MessageSource messageSource, AppProps props) { + this.messageSource = messageSource; + this.props = props; + } @Override public Map sayHello(String name) { + var messageLocalized = messageSource.getMessage("hello.user", new String[]{"Ivan"}, props.getLocale()); + logger.info("Localization:{}", messageLocalized); + Map map = new HashMap<>(); - map.put(name, "Hello, " + name); + map.put(name, messageLocalized); return map; } } diff --git a/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/LocalHello.java b/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/LocalHello.java index 6dddf223..984fc1a3 100644 --- a/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/LocalHello.java +++ b/2023-03/spring-05-springBoot/src/main/java/ru/otus/service/LocalHello.java @@ -13,12 +13,10 @@ import ru.otus.configs.AppProps; public class LocalHello { private static final Logger logger = LoggerFactory.getLogger(LocalHello.class); - private final MessageSource messageSource; private final AppProps props; private final String message; - public LocalHello(MessageSource messageSource, AppProps props, @Value("${application.message}") String message) { - this.messageSource = messageSource; + public LocalHello(AppProps props, @Value("${application.message}") String message) { this.props = props; this.message = message; } @@ -26,9 +24,6 @@ public class LocalHello { //!!! Вообще, PostConstruct - это плохая практика !!! @PostConstruct public void printHello() { - var messageLocalized = messageSource.getMessage("hello.user", new String[]{"Ivan"}, props.getLocale()); - logger.info("Localization:{}", messageLocalized); - logger.info("message from props:{}", props.getMessage()); logger.info("message:{}", message); } diff --git a/2023-03/spring-05-springBoot/src/main/resources/application.yml b/2023-03/spring-05-springBoot/src/main/resources/application.yml index 425b46b2..123a75e9 100644 --- a/2023-03/spring-05-springBoot/src/main/resources/application.yml +++ b/2023-03/spring-05-springBoot/src/main/resources/application.yml @@ -3,15 +3,6 @@ spring: basename: "i18n/appmessages" encoding: "UTF-8" -management: - endpoints: - web: - exposure: - include: info, health, beans - -server: - port: 8080 - application: message: "Test Props msg" locale: ru_RU