From 50b59892fb5e220140c0a1ba6275ca5bd7919a14 Mon Sep 17 00:00:00 2001 From: Inohara Date: Sat, 25 Feb 2023 16:54:43 +0400 Subject: [PATCH] adds 1 --- .../src/main/java/com/example/demo/Controllers/Controllers.java | 2 +- .../com/example/demo/speaker/controller/SpeakerController.java | 2 +- .../main/java/com/example/demo/speaker/domain/SpeakerRus.java | 2 +- .../java/com/example/demo/speaker/service/SpeakerService.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/src/main/java/com/example/demo/Controllers/Controllers.java b/demo/src/main/java/com/example/demo/Controllers/Controllers.java index ac04ea8..1e8e839 100644 --- a/demo/src/main/java/com/example/demo/Controllers/Controllers.java +++ b/demo/src/main/java/com/example/demo/Controllers/Controllers.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.*; @RestController @CrossOrigin public class Controllers { - @GetMapping("/hello") + @GetMapping("/") public @ResponseBody String hello(@RequestParam(value = "name", required = false, defaultValue = "World") String name) { return String.format("Hello %s!", name); } diff --git a/demo/src/main/java/com/example/demo/speaker/controller/SpeakerController.java b/demo/src/main/java/com/example/demo/speaker/controller/SpeakerController.java index 440dd98..6e7fe00 100644 --- a/demo/src/main/java/com/example/demo/speaker/controller/SpeakerController.java +++ b/demo/src/main/java/com/example/demo/speaker/controller/SpeakerController.java @@ -13,7 +13,7 @@ public class SpeakerController { } @GetMapping("/hello") - public String hello(@RequestParam(defaultValue = "Привет") String name, + public String hello(@RequestParam(defaultValue = "мир") String name, @RequestParam(defaultValue = "ru") String lang){ return speakerService.say(name, lang); } diff --git a/demo/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java b/demo/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java index 2feae5c..982fc0e 100644 --- a/demo/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java +++ b/demo/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java @@ -2,7 +2,7 @@ package com.example.demo.speaker.domain; import org.springframework.stereotype.Component; -@Component(value = "ru") + public class SpeakerRus implements Speaker{ @Override public String say(){ diff --git a/demo/src/main/java/com/example/demo/speaker/service/SpeakerService.java b/demo/src/main/java/com/example/demo/speaker/service/SpeakerService.java index 3dbe1ee..9642398 100644 --- a/demo/src/main/java/com/example/demo/speaker/service/SpeakerService.java +++ b/demo/src/main/java/com/example/demo/speaker/service/SpeakerService.java @@ -14,6 +14,6 @@ public class SpeakerService { public String say(String name, String lang){ final Speaker speaker = (Speaker) applicationContext.getBean(lang); - return String.format("Hello %s %s!", speaker.say(), name); + return String.format("%s %s!", speaker.say(), name); } }