From 8d6f526ec3e2a47c654914f99856c4daf10b45d0 Mon Sep 17 00:00:00 2001
From: Erik Moravec <xmoravec@fi.muni.cz>
Date: Tue, 27 Apr 2021 21:13:44 +0200
Subject: [PATCH] refactor: optimized imports in all project
---
.../facades/LeagueManagerFacadeImpl.java | 3 ++-
.../facades/TeamManagerFacadeImpl.java | 1 -
.../fi/pa165/icehockeymanager/model/Game.java | 8 +-------
.../fi/pa165/icehockeymanager/model/Player.java | 8 +-------
.../fi/pa165/icehockeymanager/model/Team.java | 8 +-------
.../services/PlayerService.java | 1 -
.../facades/UserFacadeImplTest.java | 17 +++--------------
7 files changed, 8 insertions(+), 38 deletions(-)
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
index 9173221..c89b87a 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/LeagueManagerFacadeImpl.java
@@ -8,10 +8,11 @@ import cz.muni.fi.pa165.icehockeymanager.model.Game;
import cz.muni.fi.pa165.icehockeymanager.model.Team;
import cz.muni.fi.pa165.icehockeymanager.services.BeanMappingService;
import cz.muni.fi.pa165.icehockeymanager.services.GameService;
-import cz.muni.fi.pa165.icehockeymanager.services.PlayerService;
import cz.muni.fi.pa165.icehockeymanager.services.TeamService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+@Service
public class LeagueManagerFacadeImpl implements LeagueManagerFacade {
private final TeamService teamService;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
index 06dd6c5..746c150 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java
@@ -2,7 +2,6 @@ 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.TeamDTO;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
import cz.muni.fi.pa165.icehockeymanager.model.Player;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java
index c6ae389..59fdb8f 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Game.java
@@ -5,13 +5,7 @@ import cz.muni.fi.pa165.icehockeymanager.properties.IDEqual;
import lombok.Getter;
import lombok.Setter;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.PositiveOrZero;
import java.time.ZonedDateTime;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java
index afe27cd..8fd23ef 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Player.java
@@ -6,13 +6,7 @@ import cz.muni.fi.pa165.icehockeymanager.properties.IDEqual;
import lombok.Getter;
import lombok.Setter;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import java.util.Objects;
import java.util.Optional;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java
index eee9794..b8df099 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/model/Team.java
@@ -6,13 +6,7 @@ import cz.muni.fi.pa165.icehockeymanager.properties.IDEqual;
import lombok.Getter;
import lombok.Setter;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import java.util.HashSet;
import java.util.Objects;
diff --git a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java
index e9f887a..aa06f7e 100644
--- a/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java
+++ b/src/main/java/cz/muni/fi/pa165/icehockeymanager/services/PlayerService.java
@@ -1,6 +1,5 @@
package cz.muni.fi.pa165.icehockeymanager.services;
-import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO;
import cz.muni.fi.pa165.icehockeymanager.model.Player;
import cz.muni.fi.pa165.icehockeymanager.model.Team;
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 32b873a..503dad3 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
@@ -8,11 +8,7 @@ import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
import cz.muni.fi.pa165.icehockeymanager.model.Game;
import cz.muni.fi.pa165.icehockeymanager.model.Player;
import cz.muni.fi.pa165.icehockeymanager.model.Team;
-import cz.muni.fi.pa165.icehockeymanager.services.BeanMappingService;
-import cz.muni.fi.pa165.icehockeymanager.services.BeanMappingServiceImpl;
-import cz.muni.fi.pa165.icehockeymanager.services.GameService;
-import cz.muni.fi.pa165.icehockeymanager.services.PlayerService;
-import cz.muni.fi.pa165.icehockeymanager.services.TeamService;
+import cz.muni.fi.pa165.icehockeymanager.services.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -23,18 +19,11 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = ApplicationConfig.class)
--
GitLab