diff --git a/src/main/java/com/example/springdemo/controller/MerchantsController.java b/src/main/java/com/example/springdemo/controller/MerchantsController.java index 30d1a39..d6e0a1c 100644 --- a/src/main/java/com/example/springdemo/controller/MerchantsController.java +++ b/src/main/java/com/example/springdemo/controller/MerchantsController.java @@ -16,7 +16,7 @@ public class MerchantsController { @PostMapping("/add") public Merchants saveMerchants(@RequestBody Merchants merchants) { - return merchantsService.insetMerchants(merchants); + return merchantsService.addMerchants(merchants); } @DeleteMapping("/delete/{id}") @@ -30,7 +30,7 @@ public class MerchantsController { } @GetMapping("/find") - public List getMerchants() { + public Iterable getMerchants() { return merchantsService.findAllMerchants(); } diff --git a/src/main/java/com/example/springdemo/controller/UsersController.java b/src/main/java/com/example/springdemo/controller/UsersController.java index 1f87919..982e790 100644 --- a/src/main/java/com/example/springdemo/controller/UsersController.java +++ b/src/main/java/com/example/springdemo/controller/UsersController.java @@ -16,7 +16,7 @@ public class UsersController { @PostMapping("/add") public Users saveUsers(@RequestBody Users users) { - return usersService.insetUsers(users); + return usersService.addUsers(users); } @DeleteMapping("/delete/{id}") diff --git a/src/main/java/com/example/springdemo/service/MerchantsService.java b/src/main/java/com/example/springdemo/service/MerchantsService.java index ef3b502..f9f3bd9 100644 --- a/src/main/java/com/example/springdemo/service/MerchantsService.java +++ b/src/main/java/com/example/springdemo/service/MerchantsService.java @@ -2,17 +2,16 @@ package com.example.springdemo.service; import com.example.springdemo.entities.Merchants; -import java.util.List; import java.util.Optional; public interface MerchantsService { - Merchants insetMerchants(Merchants merchant); + Merchants addMerchants(Merchants merchant); void deleteMerchantsById(Long id); Merchants updateMerchants(Merchants merchant); - List findAllMerchants(); + Iterable findAllMerchants(); Optional findById(Long id); diff --git a/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java b/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java index da5d3de..90a831e 100644 --- a/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java +++ b/src/main/java/com/example/springdemo/service/MerchantsServiceImpl.java @@ -14,7 +14,7 @@ public class MerchantsServiceImpl implements MerchantsService { private MerchantsRepository merchantsRepository; @Override - public Merchants insetMerchants(Merchants merchant) { + public Merchants addMerchants(Merchants merchant) { return merchantsRepository.save(merchant); } diff --git a/src/main/java/com/example/springdemo/service/UsersService.java b/src/main/java/com/example/springdemo/service/UsersService.java index 6c5baaf..c8155bf 100644 --- a/src/main/java/com/example/springdemo/service/UsersService.java +++ b/src/main/java/com/example/springdemo/service/UsersService.java @@ -2,18 +2,17 @@ package com.example.springdemo.service; import com.example.springdemo.entities.Users; -import java.util.List; import java.util.Optional; public interface UsersService { - Users insetUsers(Users user); + Users addUsers(Users user); void deleteUsersById(Long id); Users updateUsers(Users user); - List findAllUsers(); + Iterable findAllUsers(); Optional findById(Long id); diff --git a/src/main/java/com/example/springdemo/service/UsersServiceImpl.java b/src/main/java/com/example/springdemo/service/UsersServiceImpl.java index 7303fee..7faa640 100644 --- a/src/main/java/com/example/springdemo/service/UsersServiceImpl.java +++ b/src/main/java/com/example/springdemo/service/UsersServiceImpl.java @@ -5,7 +5,6 @@ import com.example.springdemo.entities.Users; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.util.List; import java.util.Optional; @Service @@ -14,7 +13,7 @@ public class UsersServiceImpl implements UsersService { private UsersRepository usersRepository; @Override - public Users insetUsers(Users user) { + public Users addUsers(Users user) { return usersRepository.save(user); } @@ -29,7 +28,7 @@ public class UsersServiceImpl implements UsersService { } @Override - public List findAllUsers() { + public Iterable findAllUsers() { return usersRepository.findAll(); }