From 0cbcca76b5e9c8613a71704b967fafb7e240c0a4 Mon Sep 17 00:00:00 2001
From: VictoriaPresnyakova <victoriapresnyakova202@gmail.com>
Date: Mon, 1 May 2023 13:41:11 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=81?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.mv.db                                    | Bin 32768 -> 40960 bytes
 .../configuration/TypeConfiguration.java      |   8 ++++----
 .../controllers/MainController.java           |   5 ++---
 .../{ => calc}/domain/ITypeInterface.java     |   2 +-
 .../is/sbapp/{ => calc}/domain/TypeArray.java |   2 +-
 .../is/sbapp/{ => calc}/domain/TypeInt.java   |   2 +-
 .../sbapp/{ => calc}/domain/TypeString.java   |   2 +-
 .../sbapp/{ => calc}/service/TypeService.java |   4 ++--
 8 files changed, 12 insertions(+), 13 deletions(-)
 rename src/main/java/ru/ulstu/is/sbapp/{ => calc}/configuration/TypeConfiguration.java (71%)
 rename src/main/java/ru/ulstu/is/sbapp/{ => calc}/controllers/MainController.java (92%)
 rename src/main/java/ru/ulstu/is/sbapp/{ => calc}/domain/ITypeInterface.java (80%)
 rename src/main/java/ru/ulstu/is/sbapp/{ => calc}/domain/TypeArray.java (96%)
 rename src/main/java/ru/ulstu/is/sbapp/{ => calc}/domain/TypeInt.java (92%)
 rename src/main/java/ru/ulstu/is/sbapp/{ => calc}/domain/TypeString.java (96%)
 rename src/main/java/ru/ulstu/is/sbapp/{ => calc}/service/TypeService.java (95%)

diff --git a/data.mv.db b/data.mv.db
index ea5a5f5e6400a2eadf9675398dbe62e276c0e464..a9b9f143cf7b930766a2d0c5d78d9317f7cb8011 100644
GIT binary patch
literal 40960
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
U{QsWi$twK%_IWJkldhTnA3mU0M*si-

literal 32768
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

diff --git a/src/main/java/ru/ulstu/is/sbapp/configuration/TypeConfiguration.java b/src/main/java/ru/ulstu/is/sbapp/calc/configuration/TypeConfiguration.java
similarity index 71%
rename from src/main/java/ru/ulstu/is/sbapp/configuration/TypeConfiguration.java
rename to src/main/java/ru/ulstu/is/sbapp/calc/configuration/TypeConfiguration.java
index 9850855..d7f668d 100644
--- a/src/main/java/ru/ulstu/is/sbapp/configuration/TypeConfiguration.java
+++ b/src/main/java/ru/ulstu/is/sbapp/calc/configuration/TypeConfiguration.java
@@ -1,10 +1,10 @@
-package ru.ulstu.is.sbapp.configuration;
+package ru.ulstu.is.sbapp.calc.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import ru.ulstu.is.sbapp.domain.TypeInt;
-import ru.ulstu.is.sbapp.domain.TypeString;
-import ru.ulstu.is.sbapp.domain.TypeArray;
+import ru.ulstu.is.sbapp.calc.domain.TypeInt;
+import ru.ulstu.is.sbapp.calc.domain.TypeString;
+import ru.ulstu.is.sbapp.calc.domain.TypeArray;
 
 
 @Configuration
diff --git a/src/main/java/ru/ulstu/is/sbapp/controllers/MainController.java b/src/main/java/ru/ulstu/is/sbapp/calc/controllers/MainController.java
similarity index 92%
rename from src/main/java/ru/ulstu/is/sbapp/controllers/MainController.java
rename to src/main/java/ru/ulstu/is/sbapp/calc/controllers/MainController.java
index 7281482..13d6f40 100644
--- a/src/main/java/ru/ulstu/is/sbapp/controllers/MainController.java
+++ b/src/main/java/ru/ulstu/is/sbapp/calc/controllers/MainController.java
@@ -1,10 +1,9 @@
-package ru.ulstu.is.sbapp.controllers;
+package ru.ulstu.is.sbapp.calc.controllers;
 
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import ru.ulstu.is.sbapp.service.TypeService;
+import ru.ulstu.is.sbapp.calc.service.TypeService;
 
 @RestController
 public class MainController {
diff --git a/src/main/java/ru/ulstu/is/sbapp/domain/ITypeInterface.java b/src/main/java/ru/ulstu/is/sbapp/calc/domain/ITypeInterface.java
similarity index 80%
rename from src/main/java/ru/ulstu/is/sbapp/domain/ITypeInterface.java
rename to src/main/java/ru/ulstu/is/sbapp/calc/domain/ITypeInterface.java
index 550e455..e5bb7e2 100644
--- a/src/main/java/ru/ulstu/is/sbapp/domain/ITypeInterface.java
+++ b/src/main/java/ru/ulstu/is/sbapp/calc/domain/ITypeInterface.java
@@ -1,4 +1,4 @@
-package ru.ulstu.is.sbapp.domain;
+package ru.ulstu.is.sbapp.calc.domain;
 
 public interface ITypeInterface<T> {
     T Sum(T value1, T value2);
diff --git a/src/main/java/ru/ulstu/is/sbapp/domain/TypeArray.java b/src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeArray.java
similarity index 96%
rename from src/main/java/ru/ulstu/is/sbapp/domain/TypeArray.java
rename to src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeArray.java
index bb999e2..bb5a1ff 100644
--- a/src/main/java/ru/ulstu/is/sbapp/domain/TypeArray.java
+++ b/src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeArray.java
@@ -1,4 +1,4 @@
-package ru.ulstu.is.sbapp.domain;
+package ru.ulstu.is.sbapp.calc.domain;
 
 public class TypeArray implements ITypeInterface<int[]>{
     @Override
diff --git a/src/main/java/ru/ulstu/is/sbapp/domain/TypeInt.java b/src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeInt.java
similarity index 92%
rename from src/main/java/ru/ulstu/is/sbapp/domain/TypeInt.java
rename to src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeInt.java
index af21a38..2ac3b1e 100644
--- a/src/main/java/ru/ulstu/is/sbapp/domain/TypeInt.java
+++ b/src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeInt.java
@@ -1,4 +1,4 @@
-package ru.ulstu.is.sbapp.domain;
+package ru.ulstu.is.sbapp.calc.domain;
 
 public class TypeInt implements ITypeInterface<Integer>{
     @Override
diff --git a/src/main/java/ru/ulstu/is/sbapp/domain/TypeString.java b/src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeString.java
similarity index 96%
rename from src/main/java/ru/ulstu/is/sbapp/domain/TypeString.java
rename to src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeString.java
index 4ba7604..d85fe1f 100644
--- a/src/main/java/ru/ulstu/is/sbapp/domain/TypeString.java
+++ b/src/main/java/ru/ulstu/is/sbapp/calc/domain/TypeString.java
@@ -1,4 +1,4 @@
-package ru.ulstu.is.sbapp.domain;
+package ru.ulstu.is.sbapp.calc.domain;
 
 public class TypeString implements ITypeInterface<String>{
     @Override
diff --git a/src/main/java/ru/ulstu/is/sbapp/service/TypeService.java b/src/main/java/ru/ulstu/is/sbapp/calc/service/TypeService.java
similarity index 95%
rename from src/main/java/ru/ulstu/is/sbapp/service/TypeService.java
rename to src/main/java/ru/ulstu/is/sbapp/calc/service/TypeService.java
index 00aad69..b978f33 100644
--- a/src/main/java/ru/ulstu/is/sbapp/service/TypeService.java
+++ b/src/main/java/ru/ulstu/is/sbapp/calc/service/TypeService.java
@@ -1,8 +1,8 @@
-package ru.ulstu.is.sbapp.service;
+package ru.ulstu.is.sbapp.calc.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.context.ApplicationContext;
-import ru.ulstu.is.sbapp.domain.ITypeInterface;
+import ru.ulstu.is.sbapp.calc.domain.ITypeInterface;
 
 import java.util.Arrays;