From d5a05d12bcded92c11f0b3d1dcf8435b8f4eddee Mon Sep 17 00:00:00 2001
From: Erik Moravec <xmoravec@fi.muni.cz>
Date: Fri, 28 May 2021 19:27:19 +0200
Subject: [PATCH] refactor: Rest API methods name changes
---
.../dto/{PlayerVeteranDTO.java => PlayerTransferDTO.java} | 5 ++---
.../pa165/icehockeymanager/facades/TeamManagerFacade.java | 6 +++---
.../rest/controller/IceHockeyManagerApi.java | 4 ++--
.../icehockeymanager/facades/TeamManagerFacadeImpl.java | 4 ++--
.../icehockeymanager/facades/TeamManagerFacadeImplTest.java | 6 +++---
5 files changed, 12 insertions(+), 13 deletions(-)
rename api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/{PlayerVeteranDTO.java => PlayerTransferDTO.java} (80%)
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerVeteranDTO.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerTransferDTO.java
similarity index 80%
rename from api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerVeteranDTO.java
rename to api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerTransferDTO.java
index dee6016..b240dd9 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerVeteranDTO.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerTransferDTO.java
@@ -3,10 +3,9 @@ package cz.muni.fi.pa165.icehockeymanager.dto;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
import java.util.Objects;
-public final class PlayerVeteranDTO {
+public final class PlayerTransferDTO {
@Getter
@Setter
@@ -20,7 +19,7 @@ public final class PlayerVeteranDTO {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- PlayerVeteranDTO playerDTO = (PlayerVeteranDTO) o;
+ PlayerTransferDTO playerDTO = (PlayerTransferDTO) o;
return getPlayerId() == playerDTO.getPlayerId() && getTeamId() == playerDTO.getTeamId();
}
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java
index 4e097ea..ecee8f2 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java
@@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
-import cz.muni.fi.pa165.icehockeymanager.dto.PlayerVeteranDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.PlayerTransferDTO;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
@@ -24,9 +24,9 @@ public interface TeamManagerFacade {
/**
* Adds player with playerId to team with teamId
*
- * @param playerVeteranDTO DTO for recruiting veteran player
+ * @param playerTransferDTO DTO for recruiting veteran player
*/
- void recruitPlayer(PlayerVeteranDTO playerVeteranDTO);
+ void recruitPlayer(PlayerTransferDTO playerTransferDTO);
/**
* Retrieve all players without team
diff --git a/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java b/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java
index c5822c0..023b258 100644
--- a/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java
+++ b/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java
@@ -52,8 +52,8 @@ public class IceHockeyManagerApi {
teamManagerFacade.recruitNewPlayer(player);
}
- @PostMapping("/player/recruitVeteran")
- public final void recruitVeteranPlayer(@Valid @RequestBody PlayerVeteranDTO player) {
+ @PostMapping("/player/transferPlayer")
+ public final void recruitPlayer(@Valid @RequestBody PlayerTransferDTO player) {
teamManagerFacade.recruitPlayer(player);
}
diff --git a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
index db70988..c7f7873 100644
--- a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
+++ b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
@@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
-import cz.muni.fi.pa165.icehockeymanager.dto.PlayerVeteranDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.PlayerTransferDTO;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
import cz.muni.fi.pa165.icehockeymanager.model.Player;
@@ -42,7 +42,7 @@ public class TeamManagerFacadeImpl implements TeamManagerFacade{
}
@Override
- public void recruitPlayer(PlayerVeteranDTO playerDto){
+ public void recruitPlayer(PlayerTransferDTO playerDto){
Team team = teamService.findTeam(playerDto.getTeamId()).orElseThrow(
() -> new UnknownTeamException("Team not found")
);
diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java
index 2257b96..705a43b 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java
@@ -3,7 +3,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades;
import cz.muni.fi.pa165.icehockeymanager.config.PersistanceApplicationConfig;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
-import cz.muni.fi.pa165.icehockeymanager.dto.PlayerVeteranDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.PlayerTransferDTO;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
import cz.muni.fi.pa165.icehockeymanager.model.Player;
@@ -104,7 +104,7 @@ public class TeamManagerFacadeImplTest {
@Test
public void recruitVeteranPlayerNonexistentTeam() {
when(teamService.findTeam(1L)).thenReturn(Optional.empty());
- PlayerVeteranDTO player = new PlayerVeteranDTO();
+ PlayerTransferDTO player = new PlayerTransferDTO();
player.setPlayerId(1L);
player.setTeamId(1L);
assertThatExceptionOfType(UnknownTeamException.class).isThrownBy(
@@ -116,7 +116,7 @@ public class TeamManagerFacadeImplTest {
@Test
public void recruitVeteranPlayerNonexistentPlayer() {
Team team = buildTeamMock(1L, "Boston Bruins");
- PlayerVeteranDTO player = new PlayerVeteranDTO();
+ PlayerTransferDTO player = new PlayerTransferDTO();
player.setPlayerId(1L);
player.setTeamId(1L);
when(teamService.findTeam(1L)).thenReturn(Optional.ofNullable(team));
--
GitLab