Comply to spring package structure

backend/src/main/java/de/hft/geotime/controllers/UserController.java

@@ -1,5 +1,7 @@
-package de.hft.geotime.user;
+package de.hft.geotime.controllers;
 
+import de.hft.geotime.entities.TimetrackUser;
+import de.hft.geotime.repositories.TimetrackUserRepository;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;

backend/src/main/java/de/hft/geotime/entities/RecordType.java

@@ -1,4 +1,4 @@
-package de.hft.geotime.record;
+package de.hft.geotime.entities;
 
 public enum RecordType {
 

backend/src/main/java/de/hft/geotime/entities/Role.java

@@ -1,4 +1,4 @@
-package de.hft.geotime.role;
+package de.hft.geotime.entities;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

backend/src/main/java/de/hft/geotime/entities/TimeRecord.java

@@ -1,6 +1,5 @@
-package de.hft.geotime.record;
+package de.hft.geotime.entities;
 
-import de.hft.geotime.timetrackaccount.TimetrackAccount;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

backend/src/main/java/de/hft/geotime/entities/TimetrackAccount.java

@@ -1,6 +1,5 @@
-package de.hft.geotime.timetrackaccount;
+package de.hft.geotime.entities;
 
-import de.hft.geotime.user.TimetrackUser;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

backend/src/main/java/de/hft/geotime/entities/TimetrackUser.java

@@ -1,8 +1,8 @@
-package de.hft.geotime.user;
+package de.hft.geotime.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.hft.geotime.role.Role;
+import de.hft.geotime.entities.Role;
-import de.hft.geotime.timetrackaccount.TimetrackAccount;
+import de.hft.geotime.entities.TimetrackAccount;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

backend/src/main/java/de/hft/geotime/entities/projections/AccountWithUserProjection.java

@@ -1,6 +1,7 @@
-package de.hft.geotime.timetrackaccount;
+package de.hft.geotime.entities.projections;
 
-import de.hft.geotime.user.TimetrackUser;
+import de.hft.geotime.entities.TimetrackAccount;
+import de.hft.geotime.entities.TimetrackUser;
 import org.springframework.data.rest.core.config.Projection;
 
 @Projection(name = "withUser", types = TimetrackAccount.class)

backend/src/main/java/de/hft/geotime/entities/projections/UserWithRoleProjection.java

@@ -1,10 +1,11 @@
-package de.hft.geotime.user;
+package de.hft.geotime.entities.projections;
 
+import de.hft.geotime.entities.TimetrackUser;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.rest.core.config.Projection;
 
 @Projection(name = "withRole", types = TimetrackUser.class)
-public interface BasicUserProjection {
+public interface UserWithRoleProjection {
 
     String getFirstname();
 

backend/src/main/java/de/hft/geotime/repositories/RecordRepository.java

@@ -1,5 +1,6 @@
-package de.hft.geotime.record;
+package de.hft.geotime.repositories;
 
+import de.hft.geotime.entities.TimeRecord;
 import org.springframework.data.repository.CrudRepository;
 
 public interface RecordRepository extends CrudRepository<TimeRecord, Long> {

backend/src/main/java/de/hft/geotime/repositories/RoleRepository.java

@@ -1,5 +1,6 @@
-package de.hft.geotime.role;
+package de.hft.geotime.repositories;
 
+import de.hft.geotime.entities.Role;
 import org.springframework.data.repository.CrudRepository;
 
 public interface RoleRepository extends CrudRepository<Role, Long> {

backend/src/main/java/de/hft/geotime/repositories/TimetrackAccountRepository.java

@@ -1,5 +1,6 @@
-package de.hft.geotime.timetrackaccount;
+package de.hft.geotime.repositories;
 
+import de.hft.geotime.entities.TimetrackAccount;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 

backend/src/main/java/de/hft/geotime/repositories/TimetrackUserRepository.java

@@ -1,5 +1,6 @@
-package de.hft.geotime.user;
+package de.hft.geotime.repositories;
 
+import de.hft.geotime.entities.TimetrackUser;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;

backend/src/main/java/de/hft/geotime/security/UserDetailsServiceImpl.java

@@ -1,5 +1,7 @@
-package de.hft.geotime.user;
+package de.hft.geotime.security;
 
+import de.hft.geotime.entities.TimetrackUser;
+import de.hft.geotime.repositories.TimetrackUserRepository;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

backend/src/main/java/de/hft/geotime/security/WebSecurity.java

@@ -1,6 +1,5 @@
 package de.hft.geotime.security;
 
-import de.hft.geotime.user.UserDetailsServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;