refactor: Moved exceptions into package `exceptions` - Aligned Code

diff --git a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerAdvice.java b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerAdvice.java
index 47b46bc..90b639f 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerAdvice.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerAdvice.java
@@ -1,9 +1,9 @@
 package de.juplo.kafka.chat.backend.api;
 
-import de.juplo.kafka.chat.backend.domain.InvalidUsernameException;
-import de.juplo.kafka.chat.backend.domain.MessageMutationException;
-import de.juplo.kafka.chat.backend.domain.ShardNotOwnedException;
-import de.juplo.kafka.chat.backend.domain.UnknownChatroomException;
+import de.juplo.kafka.chat.backend.domain.exceptions.InvalidUsernameException;
+import de.juplo.kafka.chat.backend.domain.exceptions.MessageMutationException;
+import de.juplo.kafka.chat.backend.domain.exceptions.ShardNotOwnedException;
+import de.juplo.kafka.chat.backend.domain.exceptions.UnknownChatroomException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ProblemDetail;

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoomData.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoomData.java
index 511b9ad..18ca0bf 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoomData.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoomData.java
@@ -1,5 +1,7 @@
 package de.juplo.kafka.chat.backend.domain;
 
+import de.juplo.kafka.chat.backend.domain.exceptions.InvalidUsernameException;
+import de.juplo.kafka.chat.backend.domain.exceptions.MessageMutationException;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/InvalidUsernameException.java b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/InvalidUsernameException.java
index f9a9b12..c79fce2 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/InvalidUsernameException.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/InvalidUsernameException.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.chat.backend.domain;
+package de.juplo.kafka.chat.backend.domain.exceptions;
 
 import lombok.Getter;
 

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/LoadInProgressException.java b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/LoadInProgressException.java
index d87e76d..8a0a81f 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/LoadInProgressException.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/LoadInProgressException.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.chat.backend.domain;
+package de.juplo.kafka.chat.backend.domain.exceptions;
 
 
 public class LoadInProgressException extends IllegalStateException

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/MessageMutationException.java b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/MessageMutationException.java
index 3f02792..f6db713 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/MessageMutationException.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/MessageMutationException.java
@@ -1,5 +1,6 @@
-package de.juplo.kafka.chat.backend.domain;
+package de.juplo.kafka.chat.backend.domain.exceptions;
 
+import de.juplo.kafka.chat.backend.domain.Message;
 import lombok.Getter;
 
 

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/ShardNotOwnedException.java b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/ShardNotOwnedException.java
index 3b63833..25df317 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/ShardNotOwnedException.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/ShardNotOwnedException.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.chat.backend.domain;
+package de.juplo.kafka.chat.backend.domain.exceptions;
 
 import lombok.Getter;
 

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/UnknownChatroomException.java b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/UnknownChatroomException.java
index 714c220..49fa69d 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/UnknownChatroomException.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/exceptions/UnknownChatroomException.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.chat.backend.domain;
+package de.juplo.kafka.chat.backend.domain.exceptions;
 
 import lombok.Getter;
 

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardedChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardedChatHome.java
index 2041f53..4c8b2fa 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardedChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardedChatHome.java
@@ -1,6 +1,8 @@
 package de.juplo.kafka.chat.backend.persistence.inmemory;
 
 import de.juplo.kafka.chat.backend.domain.*;
+import de.juplo.kafka.chat.backend.domain.exceptions.ShardNotOwnedException;
+import de.juplo.kafka.chat.backend.domain.exceptions.UnknownChatroomException;
 import de.juplo.kafka.chat.backend.persistence.ShardingStrategy;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java
index c8ddbf9..868c01e 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java
@@ -1,6 +1,7 @@
 package de.juplo.kafka.chat.backend.persistence.inmemory;
 
 import de.juplo.kafka.chat.backend.domain.*;
+import de.juplo.kafka.chat.backend.domain.exceptions.UnknownChatroomException;
 import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
index 45e93cc..7e95c64 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/ChatRoomChannel.java
@@ -1,6 +1,8 @@
 package de.juplo.kafka.chat.backend.persistence.kafka;
 
 import de.juplo.kafka.chat.backend.domain.*;
+import de.juplo.kafka.chat.backend.domain.exceptions.LoadInProgressException;
+import de.juplo.kafka.chat.backend.domain.exceptions.ShardNotOwnedException;
 import de.juplo.kafka.chat.backend.persistence.kafka.messages.AbstractMessageTo;
 import de.juplo.kafka.chat.backend.persistence.kafka.messages.CommandCreateChatRoomTo;
 import de.juplo.kafka.chat.backend.persistence.kafka.messages.EventChatMessageReceivedTo;

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java
index 8c749d6..86b3270 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatHome.java
@@ -3,7 +3,7 @@ package de.juplo.kafka.chat.backend.persistence.kafka;
 import de.juplo.kafka.chat.backend.domain.ChatHome;
 import de.juplo.kafka.chat.backend.domain.ChatRoomData;
 import de.juplo.kafka.chat.backend.domain.ChatRoomInfo;
-import de.juplo.kafka.chat.backend.domain.UnknownChatroomException;
+import de.juplo.kafka.chat.backend.domain.exceptions.UnknownChatroomException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.utils.Utils;

diff --git a/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java b/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java
index a7e4078..f831dba 100644 (file)
--- a/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java
@@ -2,6 +2,8 @@ package de.juplo.kafka.chat.backend.api;
 
 import de.juplo.kafka.chat.backend.ChatBackendProperties;
 import de.juplo.kafka.chat.backend.domain.*;
+import de.juplo.kafka.chat.backend.domain.exceptions.ShardNotOwnedException;
+import de.juplo.kafka.chat.backend.domain.exceptions.UnknownChatroomException;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeTest.java b/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeTest.java
index 5b50314..6282643 100644 (file)
--- a/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeTest.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeTest.java
@@ -1,5 +1,7 @@
 package de.juplo.kafka.chat.backend.domain;
 
+import de.juplo.kafka.chat.backend.domain.exceptions.LoadInProgressException;
+import de.juplo.kafka.chat.backend.domain.exceptions.UnknownChatroomException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeWithShardsTest.java b/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeWithShardsTest.java
index c65908c..65a67b9 100644 (file)
--- a/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeWithShardsTest.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/domain/ChatHomeWithShardsTest.java
@@ -1,5 +1,7 @@
 package de.juplo.kafka.chat.backend.domain;
 
+import de.juplo.kafka.chat.backend.domain.exceptions.LoadInProgressException;
+import de.juplo.kafka.chat.backend.domain.exceptions.ShardNotOwnedException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;