DDD & Hexagonal Arch

src/main/java/com/swish/app/config/ApplicationConfig.java

@@ -1,6 +1,6 @@
 package com.swish.app.config;
 
-import com.swish.app.repository.UserRepository;
+import com.swish.app.infrastructure.persistence.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/swish/app/config/SecurityConfiguration.java

@@ -1,5 +1,6 @@
 package com.swish.app.config;
 
+import com.swish.app.infrastructure.security.JwtAuthenticationFilter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/swish/app/entity/Game.java → src/main/java/com/swish/app/domain/Game.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 import java.time.LocalDateTime;
 import javax.persistence.Entity;

src/main/java/com/swish/app/entity/GameStatus.java → src/main/java/com/swish/app/domain/GameStatus.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 public enum GameStatus {
   SCHEDULED,

src/main/java/com/swish/app/entity/Player.java → src/main/java/com/swish/app/domain/Player.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

src/main/java/com/swish/app/entity/PlayerStats.java → src/main/java/com/swish/app/domain/PlayerStats.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

src/main/java/com/swish/app/entity/PlayerStatus.java → src/main/java/com/swish/app/domain/PlayerStatus.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 public enum PlayerStatus {
   HEALTHY,

src/main/java/com/swish/app/entity/Role.java → src/main/java/com/swish/app/domain/Role.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 public enum Role {
   ADMIN,

src/main/java/com/swish/app/entity/Team.java → src/main/java/com/swish/app/domain/Team.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

src/main/java/com/swish/app/entity/TeamStats.java → src/main/java/com/swish/app/domain/TeamStats.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

src/main/java/com/swish/app/entity/User.java → src/main/java/com/swish/app/domain/User.java

@@ -1,4 +1,4 @@
-package com.swish.app.entity;
+package com.swish.app.domain;
 
 import java.util.Collection;
 import java.util.List;

src/main/java/com/swish/app/entity/assembler/GameAssembler.java → src/main/java/com/swish/app/domain/assembler/GameAssembler.java

@@ -1,10 +1,10 @@
-package com.swish.app.entity.assembler;
+package com.swish.app.domain.assembler;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import com.swish.app.controller.GameController;
-import com.swish.app.entity.Game;
+import com.swish.app.domain.Game;
+import com.swish.app.infrastructure.web.controller.GameController;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.RepresentationModelAssembler;
 import org.springframework.stereotype.Component;

src/main/java/com/swish/app/entity/assembler/PlayerAssembler.java → src/main/java/com/swish/app/domain/assembler/PlayerAssembler.java

@@ -1,10 +1,10 @@
-package com.swish.app.entity.assembler;
+package com.swish.app.domain.assembler;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import com.swish.app.controller.PlayerController;
-import com.swish.app.entity.Player;
+import com.swish.app.domain.Player;
+import com.swish.app.infrastructure.web.controller.PlayerController;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.RepresentationModelAssembler;
 import org.springframework.stereotype.Component;

src/main/java/com/swish/app/entity/assembler/PlayerStatsAssembler.java → src/main/java/com/swish/app/domain/assembler/PlayerStatsAssembler.java

@@ -1,10 +1,10 @@
-package com.swish.app.entity.assembler;
+package com.swish.app.domain.assembler;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import com.swish.app.controller.PlayerStatsController;
-import com.swish.app.entity.PlayerStats;
+import com.swish.app.domain.PlayerStats;
+import com.swish.app.infrastructure.web.controller.PlayerStatsController;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.RepresentationModelAssembler;
 import org.springframework.stereotype.Component;

src/main/java/com/swish/app/entity/assembler/TeamAssembler.java → src/main/java/com/swish/app/domain/assembler/TeamAssembler.java

@@ -1,10 +1,10 @@
-package com.swish.app.entity.assembler;
+package com.swish.app.domain.assembler;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import com.swish.app.controller.TeamController;
-import com.swish.app.entity.Team;
+import com.swish.app.domain.Team;
+import com.swish.app.infrastructure.web.controller.TeamController;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.RepresentationModelAssembler;
 import org.springframework.stereotype.Component;

src/main/java/com/swish/app/entity/assembler/TeamStatsAssembler.java → src/main/java/com/swish/app/domain/assembler/TeamStatsAssembler.java

@@ -1,10 +1,10 @@
-package com.swish.app.entity.assembler;
+package com.swish.app.domain.assembler;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import com.swish.app.controller.TeamStatsController;
-import com.swish.app.entity.TeamStats;
+import com.swish.app.domain.TeamStats;
+import com.swish.app.infrastructure.web.controller.TeamStatsController;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.RepresentationModelAssembler;
 import org.springframework.stereotype.Component;

src/main/java/com/swish/app/entity/assembler/UserAssembler.java → src/main/java/com/swish/app/domain/assembler/UserAssembler.java

@@ -1,10 +1,10 @@
-package com.swish.app.entity.assembler;
+package com.swish.app.domain.assembler;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import com.swish.app.controller.UserController;
-import com.swish.app.entity.User;
+import com.swish.app.domain.User;
+import com.swish.app.infrastructure.web.controller.UserController;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.server.RepresentationModelAssembler;
 import org.springframework.stereotype.Component;

src/main/java/com/swish/app/repository/GameRepository.java → src/main/java/com/swish/app/infrastructure/persistence/GameRepository.java

@@ -1,6 +1,6 @@
-package com.swish.app.repository;
+package com.swish.app.infrastructure.persistence;
 
-import com.swish.app.entity.Game;
+import com.swish.app.domain.Game;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface GameRepository extends JpaRepository<Game, Long> {

src/main/java/com/swish/app/repository/PlayerRepository.java → src/main/java/com/swish/app/infrastructure/persistence/PlayerRepository.java

@@ -1,7 +1,7 @@
-package com.swish.app.repository;
+package com.swish.app.infrastructure.persistence;
 
-import com.swish.app.entity.Player;
-import com.swish.app.entity.Team;
+import com.swish.app.domain.Player;
+import com.swish.app.domain.Team;
 import java.util.Collection;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/swish/app/repository/PlayerStatsRepository.java → src/main/java/com/swish/app/infrastructure/persistence/PlayerStatsRepository.java

@@ -1,8 +1,8 @@
-package com.swish.app.repository;
+package com.swish.app.infrastructure.persistence;
 
-import com.swish.app.entity.Game;
-import com.swish.app.entity.Player;
-import com.swish.app.entity.PlayerStats;
+import com.swish.app.domain.Game;
+import com.swish.app.domain.Player;
+import com.swish.app.domain.PlayerStats;
 import java.util.Collection;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/swish/app/repository/TeamRepository.java → src/main/java/com/swish/app/infrastructure/persistence/TeamRepository.java

@@ -1,6 +1,6 @@
-package com.swish.app.repository;
+package com.swish.app.infrastructure.persistence;
 
-import com.swish.app.entity.Team;
+import com.swish.app.domain.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TeamRepository extends JpaRepository<Team, Long> {

src/main/java/com/swish/app/repository/TeamStatsRepository.java → src/main/java/com/swish/app/infrastructure/persistence/TeamStatsRepository.java

@@ -1,8 +1,8 @@
-package com.swish.app.repository;
+package com.swish.app.infrastructure.persistence;
 
-import com.swish.app.entity.Game;
-import com.swish.app.entity.Team;
-import com.swish.app.entity.TeamStats;
+import com.swish.app.domain.Game;
+import com.swish.app.domain.Team;
+import com.swish.app.domain.TeamStats;
 import java.util.Collection;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/swish/app/repository/UserRepository.java → src/main/java/com/swish/app/infrastructure/persistence/UserRepository.java

@@ -1,6 +1,6 @@
-package com.swish.app.repository;
+package com.swish.app.infrastructure.persistence;
 
-import com.swish.app.entity.User;
+import com.swish.app.domain.User;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/swish/app/config/JwtAuthenticationFilter.java → src/main/java/com/swish/app/infrastructure/security/JwtAuthenticationFilter.java

@@ -1,6 +1,5 @@
-package com.swish.app.config;
+package com.swish.app.infrastructure.security;
 
-import com.swish.app.security.JwtService;
 import java.io.IOException;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;

src/main/java/com/swish/app/security/JwtService.java → src/main/java/com/swish/app/infrastructure/security/JwtService.java

@@ -1,4 +1,4 @@
-package com.swish.app.security;
+package com.swish.app.infrastructure.security;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;

src/main/java/com/swish/app/controller/ScoreboardController.java → src/main/java/com/swish/app/infrastructure/web/ScoreboardController.java

@@ -1,8 +1,8 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web;
 
-import com.swish.app.entity.Game;
-import com.swish.app.entity.PlayerStats;
-import com.swish.app.entity.TeamStats;
+import com.swish.app.domain.Game;
+import com.swish.app.domain.PlayerStats;
+import com.swish.app.domain.TeamStats;
 import com.swish.app.service.GameService;
 import com.swish.app.service.PlayerStatsService;
 import com.swish.app.service.TeamStatsService;

src/main/java/com/swish/app/controller/AuthenticationController.java → src/main/java/com/swish/app/infrastructure/web/controller/AuthenticationController.java

@@ -1,4 +1,4 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
 import com.swish.app.request.AuthenticationRequest;
 import com.swish.app.request.RegisterRequest;

src/main/java/com/swish/app/controller/GameController.java → src/main/java/com/swish/app/infrastructure/web/controller/GameController.java

@@ -1,9 +1,9 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
-import com.swish.app.entity.Game;
-import com.swish.app.entity.Player;
-import com.swish.app.entity.PlayerStats;
-import com.swish.app.entity.TeamStats;
+import com.swish.app.domain.Game;
+import com.swish.app.domain.Player;
+import com.swish.app.domain.PlayerStats;
+import com.swish.app.domain.TeamStats;
 import com.swish.app.service.GameService;
 import com.swish.app.service.PlayerService;
 import com.swish.app.service.PlayerStatsService;

src/main/java/com/swish/app/controller/GameNotFoundAdvice.java → src/main/java/com/swish/app/infrastructure/web/controller/GameNotFoundAdvice.java

@@ -1,4 +1,4 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
 import com.swish.app.exception.GameNotFoundException;
 import org.springframework.http.HttpStatus;

src/main/java/com/swish/app/controller/PlayerController.java → src/main/java/com/swish/app/infrastructure/web/controller/PlayerController.java

@@ -1,7 +1,7 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
-import com.swish.app.entity.Player;
-import com.swish.app.entity.Team;
+import com.swish.app.domain.Player;
+import com.swish.app.domain.Team;
 import com.swish.app.service.PlayerService;
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.EntityModel;

src/main/java/com/swish/app/controller/PlayerNotFoundAdvice.java → src/main/java/com/swish/app/infrastructure/web/controller/PlayerNotFoundAdvice.java

@@ -1,4 +1,4 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
 import com.swish.app.exception.PlayerNotFoundException;
 import org.springframework.http.HttpStatus;

src/main/java/com/swish/app/controller/PlayerStatsController.java → src/main/java/com/swish/app/infrastructure/web/controller/PlayerStatsController.java

@@ -1,8 +1,8 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
-import com.swish.app.entity.Game;
-import com.swish.app.entity.Player;
-import com.swish.app.entity.PlayerStats;
+import com.swish.app.domain.Game;
+import com.swish.app.domain.Player;
+import com.swish.app.domain.PlayerStats;
 import com.swish.app.service.PlayerStatsService;
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.EntityModel;

src/main/java/com/swish/app/controller/PlayerStatsNotFoundAdvice.java → src/main/java/com/swish/app/infrastructure/web/controller/PlayerStatsNotFoundAdvice.java

@@ -1,4 +1,4 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
 import com.swish.app.exception.PlayerStatsNotFoundException;
 import org.springframework.http.HttpStatus;

src/main/java/com/swish/app/controller/TeamController.java → src/main/java/com/swish/app/infrastructure/web/controller/TeamController.java

@@ -1,6 +1,6 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
-import com.swish.app.entity.Team;
+import com.swish.app.domain.Team;
 import com.swish.app.service.TeamService;
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.EntityModel;

src/main/java/com/swish/app/controller/TeamNotFoundAdvice.java → src/main/java/com/swish/app/infrastructure/web/controller/TeamNotFoundAdvice.java

@@ -1,4 +1,4 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
 import com.swish.app.exception.TeamNotFoundException;
 import org.springframework.http.HttpStatus;

src/main/java/com/swish/app/controller/TeamStatsController.java → src/main/java/com/swish/app/infrastructure/web/controller/TeamStatsController.java

@@ -1,8 +1,8 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
-import com.swish.app.entity.Game;
-import com.swish.app.entity.Team;
-import com.swish.app.entity.TeamStats;
+import com.swish.app.domain.Game;
+import com.swish.app.domain.Team;
+import com.swish.app.domain.TeamStats;
 import com.swish.app.service.TeamStatsService;
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.EntityModel;

src/main/java/com/swish/app/controller/TeamStatsNotFoundAdvice.java → src/main/java/com/swish/app/infrastructure/web/controller/TeamStatsNotFoundAdvice.java

@@ -1,4 +1,4 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
 import com.swish.app.exception.TeamStatsNotFoundException;
 import org.springframework.http.HttpStatus;

src/main/java/com/swish/app/controller/UserController.java → src/main/java/com/swish/app/infrastructure/web/controller/UserController.java

@@ -1,6 +1,6 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
-import com.swish.app.entity.User;
+import com.swish.app.domain.User;
 import com.swish.app.service.UserService;
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.EntityModel;

src/main/java/com/swish/app/controller/UserNotFoundAdvice.java → src/main/java/com/swish/app/infrastructure/web/controller/UserNotFoundAdvice.java

@@ -1,4 +1,4 @@
-package com.swish.app.controller;
+package com.swish.app.infrastructure.web.controller;
 
 import com.swish.app.exception.UserNotFoundException;
 import org.springframework.http.HttpStatus;

src/main/java/com/swish/app/service/AuthenticationService.java

@@ -1,12 +1,12 @@
 package com.swish.app.service;
 
-import com.swish.app.entity.Role;
-import com.swish.app.entity.User;
-import com.swish.app.repository.UserRepository;
+import com.swish.app.domain.Role;
+import com.swish.app.domain.User;
+import com.swish.app.infrastructure.persistence.UserRepository;
+import com.swish.app.infrastructure.security.JwtService;
 import com.swish.app.request.AuthenticationRequest;
 import com.swish.app.request.RegisterRequest;
 import com.swish.app.response.AuthenticationResponse;
-import com.swish.app.security.JwtService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

src/main/java/com/swish/app/service/GameService.java

@@ -3,11 +3,11 @@
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import com.swish.app.controller.GameController;
-import com.swish.app.entity.Game;
-import com.swish.app.entity.assembler.GameAssembler;
+import com.swish.app.domain.Game;
+import com.swish.app.domain.assembler.GameAssembler;
 import com.swish.app.exception.GameNotFoundException;
-import com.swish.app.repository.GameRepository;
+import com.swish.app.infrastructure.persistence.GameRepository;
+import com.swish.app.infrastructure.web.controller.GameController;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.hateoas.CollectionModel;