pgirl1/IP_Borschevskaya_Lab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab2: fixes

Browse Source
This commit is contained in:
Katerina881 2023-02-21 12:03:06 +04:00
parent 5d6c6afeba
commit 3bea45850b
3 changed files with 30 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/example/springip/controllers/OperationController.java
View File

@ -14,23 +14,27 @@ public class OperationController {
} }
@GetMapping("/sum") @GetMapping("/sum")
public Object sum(@RequestParam String val1, @RequestParam String val2) { public Object sum(@RequestParam String val1, @RequestParam String val2, @RequestParam String type) {
return (Object) operationService.sum(val1, val2);
return (Object) operationService.sum(val1, val2, type);
} }
@GetMapping("/mul") @GetMapping("/mul")
public Object mul(@RequestParam String val1, @RequestParam Integer val2) { public Object mul(@RequestParam String val1, @RequestParam Integer val2, @RequestParam String type) {
return (Object) operationService.mul(val1, val2);
return (Object) operationService.mul(val1, val2, type);
} }
@GetMapping("/length") @GetMapping("/length")
public Object length(@RequestParam String val1) { public Object length(@RequestParam String val1, @RequestParam String type) {
return (Object) operationService.length(val1);
return (Object) operationService.length(val1, type);
} }
@GetMapping("/startsWith") @GetMapping("/startsWith")
public Object startsWith(@RequestParam String val1, @RequestParam String val2) { public Object startsWith(@RequestParam String val1, @RequestParam String val2, @RequestParam String type) {
return (Object) operationService.startsWith(val1, val2);
return (Object) operationService.startsWith(val1, val2, type);
} }

49
src/main/java/com/example/springip/service/OperationService.java
View File

@ -13,64 +13,35 @@ public class OperationService {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
} }
public Object sum(String o, String o2){ public Object sum(Object o, Object o2, String type){
String type = "";
try {
Integer.parseInt(o);
Integer.parseInt(o2);
type = "num";
} catch (Exception ex) {
type = "str";
}
OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type); OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type);
if (type.equals("num")) if (type.equals("num"))
return operationInterface.sum(Integer.parseInt(o),Integer.parseInt(o2)); return operationInterface.sum(Integer.parseInt(o.toString()),Integer.parseInt(o2.toString()));
return operationInterface.sum(o, o2); return operationInterface.sum(o, o2);
} }
public Object mul(String o, Integer o2){ public Object mul(Object o, Object o2, String type){
String type = "";
try {
Integer.parseInt(o);
type = "num";
} catch (Exception ex) {
type = "str";
}
OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type); OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type);
if (type.equals("num")) if (type.equals("num"))
return operationInterface.mul(Integer.parseInt(o), o2); return operationInterface.mul(Integer.parseInt(o.toString()), Integer.parseInt(o2.toString()));
return operationInterface.mul(o, o2); return operationInterface.mul(o, Integer.parseInt(o2.toString()));
} }
public Object length(String o){ public Object length(Object o, String type){
String type = "";
try {
Integer.parseInt(o);
type = "num";
} catch (Exception ex) {
type = "str";
}
OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type); OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type);
if (type.equals("num")) if (type.equals("num"))
return operationInterface.length(Integer.parseInt(o)); return operationInterface.length(Integer.parseInt(o.toString()));
return operationInterface.length(o); return operationInterface.length(o);
} }
public Object startsWith(String o, String o2){ public Object startsWith(Object o, Object o2, String type){
String type = "";
try {
Integer.parseInt(o);
Integer.parseInt(o2);
type = "num";
} catch (Exception ex) {
type = "str";
}
OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type); OperationInterface operationInterface = (OperationInterface) applicationContext.getBean(type);
if (type.equals("num")) if (type.equals("num"))
return operationInterface.startsWith(Integer.parseInt(o), Integer.parseInt(o2)); return operationInterface.startsWith(Integer.parseInt(o.toString()), Integer.parseInt(o2.toString()));
return operationInterface.startsWith(o,o2); return operationInterface.startsWith(o,o2);
} }

16
src/test/java/com/example/springip/SpringipApplicationTests.java
View File

@ -13,48 +13,48 @@ class SpringipApplicationTests {
@Test @Test
public void testSumString() { public void testSumString() {
final String res = (String) operationService.sum("Привет ", "Мир!"); final String res = (String) operationService.sum("Привет ", "Мир!", "str");
Assertions.assertEquals("Привет Мир!", res); Assertions.assertEquals("Привет Мир!", res);
} }
@Test @Test
public void testSumNum() { public void testSumNum() {
final Integer res = (Integer) operationService.sum("1", "2"); final Integer res = (Integer) operationService.sum(1, 2, "num");
Assertions.assertEquals(3, res); Assertions.assertEquals(3, res);
} }
@Test @Test
public void testMulString() { public void testMulString() {
final String res = (String) operationService.mul("A", 4); final String res = (String) operationService.mul("A", 4, "str");
Assertions.assertEquals("AAAA", res); Assertions.assertEquals("AAAA", res);
} }
@Test @Test
public void testMulNum() { public void testMulNum() {
final Integer res = (Integer) operationService.mul("2", 4); final Integer res = (Integer) operationService.mul(2, 4, "num");
Assertions.assertEquals(8, res); Assertions.assertEquals(8, res);
} }
@Test @Test
public void testLengthString() { public void testLengthString() {
final Integer res = (Integer) operationService.length("Hello"); final Integer res = (Integer) operationService.length("Hello", "str");
Assertions.assertEquals(5, res); Assertions.assertEquals(5, res);
} }
@Test @Test
public void testLengthNum() { public void testLengthNum() {
final Integer res = (Integer) operationService.length("777"); final Integer res = (Integer) operationService.length(777,"num");
Assertions.assertEquals(3, res); Assertions.assertEquals(3, res);
} }
@Test @Test
public void testStWString() { public void testStWString() {
final boolean res = (boolean) operationService.startsWith("Orange","Or"); final boolean res = (boolean) operationService.startsWith("Orange","Or", "str");
Assertions.assertEquals(true, res); Assertions.assertEquals(true, res);
} }
@Test @Test
public void testStWNum() { public void testStWNum() {
final boolean res = (boolean) operationService.startsWith("777","77"); final boolean res = (boolean) operationService.startsWith(777, 77, "num");
Assertions.assertEquals(true, res); Assertions.assertEquals(true, res);
} }