From 534347923995ef81e7fd2d60260df604b584d18f Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Thu, 16 Mar 2023 16:01:43 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=84=D0=B0=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BE=20=D0=BF=D0=BE=20=D0=BF=D0=B0=D0=BF?= =?UTF-8?q?=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springip/{ => lab1}/controllers/TestController.java | 2 +- .../{ => lab2}/controllers/OperationController.java | 4 ++-- .../springip/{ => lab2}/domains/OperationInterface.java | 2 +- .../springip/{ => lab2}/domains/OperationNumImpl.java | 7 +++---- .../springip/{ => lab2}/domains/OperationStringImpl.java | 5 +++-- .../springip/{ => lab2}/service/OperationService.java | 5 ++--- 6 files changed, 12 insertions(+), 13 deletions(-) rename src/main/java/com/example/springip/{ => lab1}/controllers/TestController.java (95%) rename src/main/java/com/example/springip/{ => lab2}/controllers/OperationController.java (92%) rename src/main/java/com/example/springip/{ => lab2}/domains/OperationInterface.java (77%) rename src/main/java/com/example/springip/{ => lab2}/domains/OperationNumImpl.java (85%) rename src/main/java/com/example/springip/{ => lab2}/domains/OperationStringImpl.java (85%) rename src/main/java/com/example/springip/{ => lab2}/service/OperationService.java (92%) diff --git a/src/main/java/com/example/springip/controllers/TestController.java b/src/main/java/com/example/springip/lab1/controllers/TestController.java similarity index 95% rename from src/main/java/com/example/springip/controllers/TestController.java rename to src/main/java/com/example/springip/lab1/controllers/TestController.java index 1483007..4f91a88 100644 --- a/src/main/java/com/example/springip/controllers/TestController.java +++ b/src/main/java/com/example/springip/lab1/controllers/TestController.java @@ -1,4 +1,4 @@ -package com.example.springip.controllers; +package com.example.springip.lab1.controllers; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/com/example/springip/controllers/OperationController.java b/src/main/java/com/example/springip/lab2/controllers/OperationController.java similarity index 92% rename from src/main/java/com/example/springip/controllers/OperationController.java rename to src/main/java/com/example/springip/lab2/controllers/OperationController.java index c50419d..1445fcc 100644 --- a/src/main/java/com/example/springip/controllers/OperationController.java +++ b/src/main/java/com/example/springip/lab2/controllers/OperationController.java @@ -1,6 +1,6 @@ -package com.example.springip.controllers; +package com.example.springip.lab2.controllers; -import com.example.springip.service.OperationService; +import com.example.springip.lab2.service.OperationService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/example/springip/domains/OperationInterface.java b/src/main/java/com/example/springip/lab2/domains/OperationInterface.java similarity index 77% rename from src/main/java/com/example/springip/domains/OperationInterface.java rename to src/main/java/com/example/springip/lab2/domains/OperationInterface.java index 18ae55d..15b4486 100644 --- a/src/main/java/com/example/springip/domains/OperationInterface.java +++ b/src/main/java/com/example/springip/lab2/domains/OperationInterface.java @@ -1,4 +1,4 @@ -package com.example.springip.domains; +package com.example.springip.lab2.domains; public interface OperationInterface { T sum(T o,T o2); diff --git a/src/main/java/com/example/springip/domains/OperationNumImpl.java b/src/main/java/com/example/springip/lab2/domains/OperationNumImpl.java similarity index 85% rename from src/main/java/com/example/springip/domains/OperationNumImpl.java rename to src/main/java/com/example/springip/lab2/domains/OperationNumImpl.java index 947498e..5702cc8 100644 --- a/src/main/java/com/example/springip/domains/OperationNumImpl.java +++ b/src/main/java/com/example/springip/lab2/domains/OperationNumImpl.java @@ -1,11 +1,10 @@ -package com.example.springip.domains; +package com.example.springip.lab2.domains; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.example.springip.lab2.domains.OperationInterface; import org.springframework.stereotype.Component; @Component(value = "num") -public class OperationNumImpl implements OperationInterface{ +public class OperationNumImpl implements OperationInterface { @Override public Integer sum(Integer o, Integer o2) { return o + o2; diff --git a/src/main/java/com/example/springip/domains/OperationStringImpl.java b/src/main/java/com/example/springip/lab2/domains/OperationStringImpl.java similarity index 85% rename from src/main/java/com/example/springip/domains/OperationStringImpl.java rename to src/main/java/com/example/springip/lab2/domains/OperationStringImpl.java index 0716e0a..4070758 100644 --- a/src/main/java/com/example/springip/domains/OperationStringImpl.java +++ b/src/main/java/com/example/springip/lab2/domains/OperationStringImpl.java @@ -1,9 +1,10 @@ -package com.example.springip.domains; +package com.example.springip.lab2.domains; +import com.example.springip.lab2.domains.OperationInterface; import org.springframework.stereotype.Component; @Component(value = "str") -public class OperationStringImpl implements OperationInterface{ +public class OperationStringImpl implements OperationInterface { @Override public String sum(String o, String o2) { return o+o2; diff --git a/src/main/java/com/example/springip/service/OperationService.java b/src/main/java/com/example/springip/lab2/service/OperationService.java similarity index 92% rename from src/main/java/com/example/springip/service/OperationService.java rename to src/main/java/com/example/springip/lab2/service/OperationService.java index 83d1f6f..0abac84 100644 --- a/src/main/java/com/example/springip/service/OperationService.java +++ b/src/main/java/com/example/springip/lab2/service/OperationService.java @@ -1,7 +1,6 @@ -package com.example.springip.service; +package com.example.springip.lab2.service; -import com.example.springip.domains.OperationInterface; -import com.example.springip.domains.OperationNumImpl; +import com.example.springip.lab2.domains.OperationInterface; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service;