From 882d169938d88ea94461f2a01439cb9d3d9aeeca Mon Sep 17 00:00:00 2001
From: Erik Moravec <xmoravec@fi.muni.cz>
Date: Fri, 28 May 2021 19:30:49 +0200
Subject: [PATCH] refactor: GameDto classes names fixed
---
.../dto/{GameCreateDTO.java => GameCreateDto.java} | 4 ++--
.../dto/{GameDTO.java => GameDto.java} | 4 ++--
...UpdateScoreDTO.java => GameUpdateScoreDto.java} | 2 +-
.../dto/{GameWinnerDTO.java => GameWinnerDto.java} | 2 +-
.../facades/LeagueManagerFacade.java | 12 ++++++------
.../pa165/icehockeymanager/facades/UserFacade.java | 6 +++---
.../rest/controller/IceHockeyManagerApi.java | 12 +++++-------
.../pa165/icehockeymanager/config/DozerConfig.java | 4 ++--
.../facades/LeagueManagerFacadeImpl.java | 6 +++---
.../icehockeymanager/facades/UserFacadeImpl.java | 10 +++++-----
.../services/BeanMappingService.java | 6 +++---
.../services/BeanMappingServiceImpl.java | 10 +++++-----
.../facades/LeagueManagerFacadeImplTest.java | 12 ++++++------
.../facades/UserFacadeImplTest.java | 14 +++++++-------
14 files changed, 51 insertions(+), 53 deletions(-)
rename api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/{GameCreateDTO.java => GameCreateDto.java} (94%)
rename api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/{GameDTO.java => GameDto.java} (96%)
rename api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/{GameUpdateScoreDTO.java => GameUpdateScoreDto.java} (92%)
rename api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/{GameWinnerDTO.java => GameWinnerDto.java} (90%)
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameCreateDTO.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameCreateDto.java
similarity index 94%
rename from api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameCreateDTO.java
rename to api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameCreateDto.java
index 43d9581..92f6dea 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameCreateDTO.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameCreateDto.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.PositiveOrZero;
import java.time.ZonedDateTime;
import java.util.Objects;
-public class GameCreateDTO {
+public class GameCreateDto {
@NotNull
@Getter
@Setter
@@ -41,7 +41,7 @@ public class GameCreateDTO {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- GameCreateDTO gameDTO = (GameCreateDTO) o;
+ GameCreateDto gameDTO = (GameCreateDto) o;
return getHomeTeamScore() == gameDTO.getHomeTeamScore() &&
getAwayTeamScore() == gameDTO.getAwayTeamScore() &&
getHomeTeamId().equals(gameDTO.getHomeTeamId()) &&
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDTO.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDto.java
similarity index 96%
rename from api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDTO.java
rename to api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDto.java
index d621422..af90e3c 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDTO.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDto.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.PositiveOrZero;
import java.time.ZonedDateTime;
import java.util.Objects;
-public class GameDTO {
+public class GameDto {
@NotNull
@Getter
@@ -48,7 +48,7 @@ public class GameDTO {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- GameDTO gameDTO = (GameDTO) o;
+ GameDto gameDTO = (GameDto) o;
return getHomeTeamScore() == gameDTO.getHomeTeamScore() &&
getAwayTeamScore() == gameDTO.getAwayTeamScore() &&
getId().equals(gameDTO.getId()) &&
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameUpdateScoreDTO.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameUpdateScoreDto.java
similarity index 92%
rename from api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameUpdateScoreDTO.java
rename to api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameUpdateScoreDto.java
index f8a80c0..e168b83 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameUpdateScoreDTO.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameUpdateScoreDto.java
@@ -6,7 +6,7 @@ import lombok.Setter;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.PositiveOrZero;
-public class GameUpdateScoreDTO {
+public class GameUpdateScoreDto {
@NotNull
@Getter
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameWinnerDTO.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameWinnerDto.java
similarity index 90%
rename from api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameWinnerDTO.java
rename to api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameWinnerDto.java
index cf88168..2fb3a85 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameWinnerDTO.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameWinnerDto.java
@@ -5,7 +5,7 @@ import lombok.Setter;
import javax.validation.constraints.NotNull;
-public class GameWinnerDTO {
+public class GameWinnerDto {
@NotNull
@Getter
@Setter
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacade.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacade.java
index 2d7ac1b..8ee5d09 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacade.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacade.java
@@ -1,8 +1,8 @@
package cz.muni.fi.pa165.icehockeymanager.facades;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameCreateDTO;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameUpdateScoreDTO;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameWinnerDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameCreateDto;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameUpdateScoreDto;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameWinnerDto;
import cz.muni.fi.pa165.icehockeymanager.dto.TeamCreateDTO;
/**
@@ -16,7 +16,7 @@ public interface LeagueManagerFacade {
*
* @param gameCreateDTO DTO object for when game is created (without id)
*/
- void createGame(GameCreateDTO gameCreateDTO);
+ void createGame(GameCreateDto gameCreateDTO);
/**
* Removes game from the schedule.
@@ -28,13 +28,13 @@ public interface LeagueManagerFacade {
* Updates the game score and also the winner if one is determined by the new score.
* @param game DTO for updating game
*/
- void updateGameScore(GameUpdateScoreDTO game);
+ void updateGameScore(GameUpdateScoreDto game);
/**
* Sets the winner of a game.
* @param game DTO for setting game winner
*/
- void setGameWinner(GameWinnerDTO game);
+ void setGameWinner(GameWinnerDto game);
/**
* Add new team to the league.
diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacade.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacade.java
index 82203fd..2254a0e 100644
--- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacade.java
+++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacade.java
@@ -1,6 +1,6 @@
package cz.muni.fi.pa165.icehockeymanager.facades;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.TeamDTO;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
@@ -21,14 +21,14 @@ public interface UserFacade {
* @return DTO objects for matching games
* @throws UnknownTeamException If id does not match any team
*/
- Collection<GameDTO> getGamesForTeam(long id);
+ Collection<GameDto> getGamesForTeam(long id);
/**
* Retrieve all games in the league.
*
* @return DTO objects for all found games
*/
- Collection<GameDTO> getGamesForLeague();
+ Collection<GameDto> getGamesForLeague();
/**
* Retrieve player based on a unique idetifier.
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 31c8002..7f60b1a 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
@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Collection;
-
@RestController
@RequestMapping("/pa165/rest")
public class IceHockeyManagerApi {
@@ -19,7 +18,6 @@ public class IceHockeyManagerApi {
private final LeagueManagerFacade leagueManagerFacade;
private final TeamManagerFacade teamManagerFacade;
-
@Autowired
public IceHockeyManagerApi(UserFacade userFacade, LeagueManagerFacade leagueManagerFacade, TeamManagerFacade teamManagerFacade) {
this.userFacade = userFacade;
@@ -68,27 +66,27 @@ public class IceHockeyManagerApi {
}
@PostMapping("/game/create")
- public final void createGame(@Valid @RequestBody GameCreateDTO game) {
+ public final void createGame(@Valid @RequestBody GameCreateDto game) {
leagueManagerFacade.createGame(game);
}
@PutMapping("/game/update")
- public final void updateGameScore(@Valid @RequestBody GameUpdateScoreDTO game) {
+ public final void updateGameScore(@Valid @RequestBody GameUpdateScoreDto game) {
leagueManagerFacade.updateGameScore(game);
}
@PutMapping("/game/setWinner")
- public final void setGameWinner(@Valid @RequestBody GameWinnerDTO game) {
+ public final void setGameWinner(@Valid @RequestBody GameWinnerDto game) {
leagueManagerFacade.setGameWinner(game);
}
@GetMapping("/game/team/{id}")
- public final Collection<GameDTO> getGamesForTeam(@PathVariable Long id) {
+ public final Collection<GameDto> getGamesForTeam(@PathVariable Long id) {
return userFacade.getGamesForTeam(id);
}
@GetMapping("/game/all")
- public final Collection<GameDTO> getGamesForLeague() {
+ public final Collection<GameDto> getGamesForLeague() {
return userFacade.getGamesForLeague();
}
diff --git a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/DozerConfig.java b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/DozerConfig.java
index 33adb65..8e4d30d 100644
--- a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/DozerConfig.java
+++ b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/DozerConfig.java
@@ -13,7 +13,7 @@ public class DozerConfig extends BeanMappingBuilder {
mapping(Player.class, PlayerCreateDTO.class);
mapping(Team.class, TeamDTO.class);
mapping(Team.class, TeamCreateDTO.class);
- mapping(Game.class, GameDTO.class);
- mapping(Game.class, GameCreateDTO.class);
+ mapping(Game.class, GameDto.class);
+ mapping(Game.class, GameCreateDto.class);
}
}
diff --git a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
index 3550f02..c758586 100644
--- a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
+++ b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
@@ -28,7 +28,7 @@ public class LeagueManagerFacadeImpl implements LeagueManagerFacade {
}
@Override
- public void createGame(GameCreateDTO gameCreateDTO) {
+ public void createGame(GameCreateDto gameCreateDTO) {
if (gameCreateDTO.getGameDateTime() == null) {
gameCreateDTO.setGameDateTime(ZonedDateTime.parse("2000-01-01T00:04:20+00:00"));
}
@@ -53,7 +53,7 @@ public class LeagueManagerFacadeImpl implements LeagueManagerFacade {
}
@Override
- public void updateGameScore(GameUpdateScoreDTO gameDTO) {
+ public void updateGameScore(GameUpdateScoreDto gameDTO) {
Game game = gameService.findGame(gameDTO.getId()).orElseThrow(
() -> new UnknownGameException("Game not found")
);
@@ -61,7 +61,7 @@ public class LeagueManagerFacadeImpl implements LeagueManagerFacade {
}
@Override
- public void setGameWinner(GameWinnerDTO gameWinner) {
+ public void setGameWinner(GameWinnerDto gameWinner) {
Game game = gameService.findGame(gameWinner.getId()).orElseThrow(
() -> new UnknownGameException("Game not found")
);
diff --git a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImpl.java b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImpl.java
index 75d517c..1032091 100644
--- a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImpl.java
+++ b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImpl.java
@@ -1,6 +1,6 @@
package cz.muni.fi.pa165.icehockeymanager.facades;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.TeamDTO;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
@@ -38,19 +38,19 @@ public class UserFacadeImpl implements UserFacade {
}
@Override
- public Collection<GameDTO> getGamesForTeam(long id) {
+ public Collection<GameDto> getGamesForTeam(long id) {
Team team = teamService.findTeam(id).orElseThrow(
() -> new UnknownTeamException("Team not found")
);
List<Game> games = new ArrayList<>(team.getHomeGames());
games.addAll(team.getAwayGames());
- return beanMappingService.mapCollection(games, GameDTO.class);
+ return beanMappingService.mapCollection(games, GameDto.class);
}
@Override
- public Collection<GameDTO> getGamesForLeague() {
+ public Collection<GameDto> getGamesForLeague() {
var games = gameService.getAllGames();
- return beanMappingService.mapCollection(games, GameDTO.class);
+ return beanMappingService.mapCollection(games, GameDto.class);
}
@Override
diff --git a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingService.java b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingService.java
index c8f68ed..4ce93b5 100644
--- a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingService.java
+++ b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingService.java
@@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.services;
import com.github.dozermapper.core.Mapper;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;
import cz.muni.fi.pa165.icehockeymanager.model.Game;
import java.util.Collection;
@@ -40,7 +40,7 @@ public interface BeanMappingService {
*/
Mapper getMapper();
- GameDTO mapTo(Game u, Class<GameDTO> mapToClass);
+ GameDto mapTo(Game u, Class<GameDto> mapToClass);
- List<GameDTO> mapCollection(Collection<Game> objects, Class<GameDTO> mapToClass);
+ List<GameDto> mapCollection(Collection<Game> objects, Class<GameDto> mapToClass);
}
\ No newline at end of file
diff --git a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingServiceImpl.java b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingServiceImpl.java
index 772cbb4..2e07040 100644
--- a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingServiceImpl.java
+++ b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/BeanMappingServiceImpl.java
@@ -1,7 +1,7 @@
package cz.muni.fi.pa165.icehockeymanager.services;
import com.github.dozermapper.core.Mapper;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;
import cz.muni.fi.pa165.icehockeymanager.dto.TeamDTO;
import cz.muni.fi.pa165.icehockeymanager.model.Game;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,18 +36,18 @@ public class BeanMappingServiceImpl implements BeanMappingService {
return dozer.map(u, mapToClass);
}
- public GameDTO mapTo(Game u, Class<GameDTO> mapToClass) {
+ public GameDto mapTo(Game u, Class<GameDto> mapToClass) {
if (u == null)
return null;
- GameDTO mappedObject = dozer.map(u, mapToClass);
+ GameDto mappedObject = dozer.map(u, mapToClass);
TeamDTO winner = mapTo(u.getWinner().orElse(null), TeamDTO.class);
mappedObject.setWinner(winner);
return mappedObject;
}
@Override
- public List<GameDTO> mapCollection(Collection<Game> objects, Class<GameDTO> mapToClass) {
- return objects.stream().map((game) -> mapTo(game, GameDTO.class)).collect(Collectors.toList());
+ public List<GameDto> mapCollection(Collection<Game> objects, Class<GameDto> mapToClass) {
+ return objects.stream().map((game) -> mapTo(game, GameDto.class)).collect(Collectors.toList());
}
public Mapper getMapper() {
diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
index 2bab781..dd2e8c5 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImplTest.java
@@ -62,23 +62,23 @@ public class LeagueManagerFacadeImplTest {
return game;
}
- public GameCreateDTO buildGameCreateDTO(Team homeTeam, Team awayTeam) {
- GameCreateDTO gameCreateDTO = new GameCreateDTO();
+ public GameCreateDto buildGameCreateDTO(Team homeTeam, Team awayTeam) {
+ GameCreateDto gameCreateDTO = new GameCreateDto();
gameCreateDTO.setHomeTeamId(homeTeam.getId());
gameCreateDTO.setAwayTeamId(awayTeam.getId());
return gameCreateDTO;
}
- public GameUpdateScoreDTO buildGameUpdateDTO(Game game, int homeScore, int awayScore) {
- var gameUpdate = new GameUpdateScoreDTO();
+ public GameUpdateScoreDto buildGameUpdateDTO(Game game, int homeScore, int awayScore) {
+ var gameUpdate = new GameUpdateScoreDto();
gameUpdate.setId(game.getId());
gameUpdate.setAwayTeamScore(awayScore);
gameUpdate.setHomeTeamScore(homeScore);
return gameUpdate;
}
- public GameWinnerDTO buildGameWinnerDTO(Game game, long teamId) {
- var gameWinner = new GameWinnerDTO();
+ public GameWinnerDto buildGameWinnerDTO(Game game, long teamId) {
+ var gameWinner = new GameWinnerDto();
gameWinner.setId(game.getId());
gameWinner.setTeamId(teamId);
return gameWinner;
diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
index 2d9fbd4..a8f78db 100644
--- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
+++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java
@@ -1,7 +1,7 @@
package cz.muni.fi.pa165.icehockeymanager.facades;
import cz.muni.fi.pa165.icehockeymanager.config.PersistanceApplicationConfig;
-import cz.muni.fi.pa165.icehockeymanager.dto.GameDTO;
+import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.TeamDTO;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
@@ -53,7 +53,7 @@ class UserFacadeImplTest {
private List<Game> gameMocks;
private TeamDTO teamPenguinsDTO;
private TeamDTO teamBruinsDTO;
- private List<GameDTO> gameDTOs;
+ private List<GameDto> gameDtos;
@BeforeEach
public void setUp() {
@@ -151,7 +151,7 @@ class UserFacadeImplTest {
buildTeamsAndGames();
when(teamService.findTeam(1)).thenReturn(Optional.of(teamPenguinsMock));
assertThat(userFacade.getGamesForTeam(1)).hasSameElementsAs(
- gameDTOs
+ gameDtos
);
verify(teamService).findTeam(1);
}
@@ -175,7 +175,7 @@ class UserFacadeImplTest {
public void getAllGamesInLeagueFoundGames() {
buildTeamsAndGames();
when(gameService.getAllGames()).thenReturn(gameMocks);
- assertThat(userFacade.getGamesForLeague()).containsExactlyElementsOf(gameDTOs);
+ assertThat(userFacade.getGamesForLeague()).containsExactlyElementsOf(gameDtos);
}
public Player buildPlayerMock(Long id, String name) {
@@ -237,7 +237,7 @@ class UserFacadeImplTest {
return player;
}
- public GameDTO buildGameDTO(
+ public GameDto buildGameDTO(
Long id,
TeamDTO homeTeam,
TeamDTO awayTeam,
@@ -246,7 +246,7 @@ class UserFacadeImplTest {
int awayTeamScore,
String gameDateTime
) {
- var game = new GameDTO();
+ var game = new GameDto();
game.setId(id);
game.setHomeTeam(homeTeam);
game.setAwayTeam(awayTeam);
@@ -284,7 +284,7 @@ class UserFacadeImplTest {
gameMocks = Arrays.asList(gameOne, gameTwo, gameThree, gameFour);
- gameDTOs = Arrays.asList(
+ gameDtos = Arrays.asList(
buildGameDTO(
1L,
teamPenguinsDTO, teamBruinsDTO,
--
GitLab