springboot/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java

@@ -1,6 +1,20 @@
 package de.thpeetz.kontor.tysc;
 
-import de.thpeetz.kontor.tysc.data.*;
+import de.thpeetz.kontor.tysc.data.Card;
+import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.tysc.data.Player;
+import de.thpeetz.kontor.tysc.data.Rooster;
+import de.thpeetz.kontor.tysc.data.Sport;
+import de.thpeetz.kontor.tysc.data.Team;
+import de.thpeetz.kontor.tysc.data.Vendor;
+import de.thpeetz.kontor.tysc.repository.CardRepository;
+import de.thpeetz.kontor.tysc.repository.CardSetRepository;
+import de.thpeetz.kontor.tysc.repository.FieldPositionRepository;
+import de.thpeetz.kontor.tysc.repository.PlayerRepository;
+import de.thpeetz.kontor.tysc.repository.RoosterRepository;
+import de.thpeetz.kontor.tysc.repository.SportRepository;
+import de.thpeetz.kontor.tysc.repository.TeamRepository;
+import de.thpeetz.kontor.tysc.repository.VendorRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardRepository.java

@@ -1,7 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
+import de.thpeetz.kontor.tysc.data.Card;
+import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.tysc.data.Rooster;
+import de.thpeetz.kontor.tysc.data.Vendor;
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -15,3 +18,4 @@ public interface CardRepository extends JpaRepository<Card, String> {
         "where str(c.cardNumber) like lower(concat('%', :searchTerm, '%')) ")
     List<Card> search(@Param("searchTerm") String searchTerm);
 }
+

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/CardSetRepository.java

@@ -1,7 +1,9 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.tysc.data.Vendor;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepository.java

@@ -1,7 +1,9 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.FieldPosition;
+import de.thpeetz.kontor.tysc.data.Sport;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/PlayerRepository.java

@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Player;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/RoosterRepository.java

@@ -1,5 +1,9 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
+import de.thpeetz.kontor.tysc.data.FieldPosition;
+import de.thpeetz.kontor.tysc.data.Player;
+import de.thpeetz.kontor.tysc.data.Rooster;
+import de.thpeetz.kontor.tysc.data.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -7,5 +11,5 @@ public interface RoosterRepository extends JpaRepository<Rooster, String>{
 
     @Query("SELECT r FROM Rooster r WHERE r.player = ?1 AND r.team = ?2 AND r.position = ?3 AND r.year = ?4")
     Rooster findByReferences(Player player, Team team, FieldPosition position, int year);
-    
 }
+

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/SportRepository.java

@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Sport;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/TeamRepository.java

@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

springboot/src/main/java/de/thpeetz/kontor/tysc/repository/VendorRepository.java

@@ -1,7 +1,8 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Vendor;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

springboot/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java

@@ -2,14 +2,14 @@ package de.thpeetz.kontor.tysc.services;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.CardRepository;
+import de.thpeetz.kontor.tysc.repository.CardSetRepository;
+import de.thpeetz.kontor.tysc.repository.VendorRepository;
 import org.springframework.stereotype.Service;
 
 import de.thpeetz.kontor.tysc.data.Card;
-import de.thpeetz.kontor.tysc.data.CardRepository;
 import de.thpeetz.kontor.tysc.data.CardSet;
-import de.thpeetz.kontor.tysc.data.CardSetRepository;
 import de.thpeetz.kontor.tysc.data.Vendor;
-import de.thpeetz.kontor.tysc.data.VendorRepository;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

springboot/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java

@@ -2,19 +2,19 @@ package de.thpeetz.kontor.tysc.services;
 
 import java.util.List;
 
-import de.thpeetz.kontor.tysc.data.FieldPosition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import de.thpeetz.kontor.tysc.data.FieldPosition;
 import de.thpeetz.kontor.tysc.data.Player;
-import de.thpeetz.kontor.tysc.data.PlayerRepository;
-import de.thpeetz.kontor.tysc.data.FieldPositionRepository;
 import de.thpeetz.kontor.tysc.data.Rooster;
-import de.thpeetz.kontor.tysc.data.RoosterRepository;
 import de.thpeetz.kontor.tysc.data.Sport;
-import de.thpeetz.kontor.tysc.data.SportRepository;
 import de.thpeetz.kontor.tysc.data.Team;
-import de.thpeetz.kontor.tysc.data.TeamRepository;
+import de.thpeetz.kontor.tysc.repository.FieldPositionRepository;
+import de.thpeetz.kontor.tysc.repository.PlayerRepository;
+import de.thpeetz.kontor.tysc.repository.RoosterRepository;
+import de.thpeetz.kontor.tysc.repository.SportRepository;
+import de.thpeetz.kontor.tysc.repository.TeamRepository;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

springboot/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java

@@ -2,6 +2,7 @@ package de.thpeetz.kontor.tysc.data;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import de.thpeetz.kontor.tysc.repository.FieldPositionRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java

@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.PlayerRepository;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;

springboot/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java

@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.RoosterRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java

@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.SportRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java

@@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.TeamRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java

@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.repository.VendorRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardRepositoryTest.java

@@ -1,10 +1,14 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Card;
+import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.tysc.data.Rooster;
+import de.thpeetz.kontor.tysc.data.Vendor;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/CardSetRepositoryTest.java

@@ -1,10 +1,12 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.CardSet;
+import de.thpeetz.kontor.tysc.data.Vendor;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java

@@ -1,10 +1,12 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.FieldPosition;
+import de.thpeetz.kontor.tysc.data.Sport;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java

@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Player;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/RoosterRepositoryTest.java

@@ -1,9 +1,13 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.FieldPosition;
+import de.thpeetz.kontor.tysc.data.Player;
+import de.thpeetz.kontor.tysc.data.Rooster;
+import de.thpeetz.kontor.tysc.data.Team;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/SportRepositoryTest.java

@@ -1,10 +1,11 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Sport;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java

@@ -1,9 +1,10 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Team;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

springboot/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java

@@ -1,10 +1,11 @@
-package de.thpeetz.kontor.tysc.data;
+package de.thpeetz.kontor.tysc.repository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
+import de.thpeetz.kontor.tysc.data.Vendor;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;