From 7e19f4471e200d799112d9e9f0502b6ed520d0f7 Mon Sep 17 00:00:00 2001 From: Tomas Madeja <t.mm.madeja@gmail.com> Date: Mon, 26 Apr 2021 11:12:38 +0200 Subject: [PATCH] refactor: idea auto reformat --- .../config/ApplicationConfig.java | 1 - .../fi/pa165/icehockeymanager/dto/GameDTO.java | 18 ++++++++++++------ .../exceptions/UnknownTeamException.java | 2 -- .../services/GameServiceImpl.java | 1 - .../facades/UserFacadeImplTest.java | 4 ++-- .../services/GameServiceImplTest.java | 1 - 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/ApplicationConfig.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/ApplicationConfig.java index 1afe38d..ada7ec0 100644 --- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/ApplicationConfig.java +++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/config/ApplicationConfig.java @@ -1,6 +1,5 @@ package cz.muni.fi.pa165.icehockeymanager.config; -import com.github.dozermapper.core.DozerBeanMapper; import com.github.dozermapper.core.DozerBeanMapperBuilder; import com.github.dozermapper.core.Mapper; import com.github.dozermapper.core.loader.api.BeanMappingBuilder; diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDTO.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDTO.java index 5a7d4f4..09a2ddf 100644 --- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDTO.java +++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/GameDTO.java @@ -11,30 +11,36 @@ import java.util.Objects; public class GameDTO { @NotNull - @Getter @Setter + @Getter + @Setter private Long id; @NotNull - @Getter @Setter + @Getter + @Setter private TeamDTO homeTeam; @NotNull - @Getter @Setter + @Getter + @Setter private TeamDTO awayTeam; // @Getter @Setter // private TeamDTO winner; @PositiveOrZero - @Getter @Setter + @Getter + @Setter private int homeTeamScore; @PositiveOrZero - @Getter @Setter + @Getter + @Setter private int awayTeamScore; @NotNull - @Getter @Setter + @Getter + @Setter private ZonedDateTime gameDateTime; @Override diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/exceptions/UnknownTeamException.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/exceptions/UnknownTeamException.java index af0efba..2600868 100644 --- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/exceptions/UnknownTeamException.java +++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/exceptions/UnknownTeamException.java @@ -1,7 +1,5 @@ package cz.muni.fi.pa165.icehockeymanager.exceptions; -import java.util.function.Supplier; - public class UnknownTeamException extends RuntimeException { public UnknownTeamException() { } diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImpl.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImpl.java index 856aa5e..b40bfb9 100644 --- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImpl.java +++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImpl.java @@ -6,7 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.transaction.Transactional; -import java.util.ArrayList; import java.util.Collection; @Service diff --git a/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java b/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java index a486d57..e4a3c21 100644 --- a/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java +++ b/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/UserFacadeImplTest.java @@ -303,14 +303,14 @@ class UserFacadeImplTest { } private Team addHomeGames(Team team, Game... games) { - for (Game game: games) + for (Game game : games) when(game.getHomeTeam()).thenReturn(team); when(team.getHomeGames()).thenReturn(new HashSet<>(Arrays.asList(games))); return team; } private Team addAwayGames(Team team, Game... games) { - for (Game game: games) + for (Game game : games) when(game.getAwayTeam()).thenReturn(team); when(team.getAwayGames()).thenReturn(new HashSet<>(Arrays.asList(games))); return team; diff --git a/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java b/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java index 36ceaf8..1e299b7 100644 --- a/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java +++ b/src/test/java/cz/muni/fi/pa165/icehockeymanager/services/GameServiceImplTest.java @@ -2,7 +2,6 @@ package cz.muni.fi.pa165.icehockeymanager.services; import cz.muni.fi.pa165.icehockeymanager.config.ApplicationConfig; import cz.muni.fi.pa165.icehockeymanager.dao.GameDao; -import cz.muni.fi.pa165.icehockeymanager.dao.PlayerDao; import cz.muni.fi.pa165.icehockeymanager.model.Game; import cz.muni.fi.pa165.icehockeymanager.model.Team; import org.junit.jupiter.api.Test; -- GitLab