projects
/
demos
/
kafka
/
chat
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c2cfba
)
refactor: Moved implementation details out of `domain` -- Aligned code
author
Kai Moritz
<kai@juplo.de>
Sun, 20 Aug 2023 10:57:41 +0000
(12:57 +0200)
committer
Kai Moritz
<kai@juplo.de>
Wed, 23 Aug 2023 05:37:03 +0000
(07:37 +0200)
16 files changed:
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ChatHomeService.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryServicesConfiguration.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/KafkaLikeShardingStrategy.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardedChatHome.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardingStrategy.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHome.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageConfiguration.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageStrategy.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageConfiguration.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageStrategy.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/nostorage/NoStorageStorageConfiguration.java
patch
|
blob
|
history
src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java
patch
|
blob
|
history
src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractInMemoryStorageIT.java
patch
|
blob
|
history
src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
patch
|
blob
|
history
src/test/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHomeTest.java
patch
|
blob
|
history
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ChatHomeService.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ChatHomeService.java
index
19ff4aa
..
f47e017
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ChatHomeService.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ChatHomeService.java
@@
-1,5
+1,6
@@
-package de.juplo.kafka.chat.backend.
domain
;
+package de.juplo.kafka.chat.backend.
persistence.inmemory
;
+import de.juplo.kafka.chat.backend.domain.ChatRoom;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
index
8f262a0
..
381f5db
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryChatHomeService.java
@@
-1,7
+1,6
@@
package de.juplo.kafka.chat.backend.persistence.inmemory;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
package de.juplo.kafka.chat.backend.persistence.inmemory;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
-import de.juplo.kafka.chat.backend.domain.ChatHomeService;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
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/persistence/inmemory/InMemoryServicesConfiguration.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryServicesConfiguration.java
index
175f714
..
375ed72
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryServicesConfiguration.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/InMemoryServicesConfiguration.java
@@
-2,11
+2,7
@@
package de.juplo.kafka.chat.backend.persistence.inmemory;
import de.juplo.kafka.chat.backend.ChatBackendProperties;
import de.juplo.kafka.chat.backend.ChatBackendProperties.ShardingStrategyType;
import de.juplo.kafka.chat.backend.ChatBackendProperties;
import de.juplo.kafka.chat.backend.ChatBackendProperties.ShardingStrategyType;
-import de.juplo.kafka.chat.backend.domain.ShardedChatHome;
-import de.juplo.kafka.chat.backend.persistence.KafkaLikeShardingStrategy;
-import de.juplo.kafka.chat.backend.domain.ShardingStrategy;
import de.juplo.kafka.chat.backend.domain.ChatHome;
import de.juplo.kafka.chat.backend.domain.ChatHome;
-import de.juplo.kafka.chat.backend.domain.SimpleChatHome;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/KafkaLikeShardingStrategy.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/KafkaLikeShardingStrategy.java
index
41fd9cd
..
8ced015
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/KafkaLikeShardingStrategy.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/KafkaLikeShardingStrategy.java
@@
-1,6
+1,6
@@
-package de.juplo.kafka.chat.backend.persistence;
+package de.juplo.kafka.chat.backend.persistence
.inmemory
;
-import de.juplo.kafka.chat.backend.
domain
.ShardingStrategy;
+import de.juplo.kafka.chat.backend.
persistence.inmemory
.ShardingStrategy;
import lombok.RequiredArgsConstructor;
import org.apache.kafka.common.utils.Utils;
import lombok.RequiredArgsConstructor;
import org.apache.kafka.common.utils.Utils;
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
6d2f079
..
4fa4d9b
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,5
+1,8
@@
-package de.juplo.kafka.chat.backend.
domain
;
+package de.juplo.kafka.chat.backend.
persistence.inmemory
;
+import de.juplo.kafka.chat.backend.domain.ChatHome;
+import de.juplo.kafka.chat.backend.domain.ChatRoom;
+import de.juplo.kafka.chat.backend.domain.ShardNotOwnedException;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
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/persistence/inmemory/ShardingStrategy.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardingStrategy.java
index
dde0e54
..
da75863
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardingStrategy.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/inmemory/ShardingStrategy.java
@@
-1,4
+1,4
@@
-package de.juplo.kafka.chat.backend.
domain
;
+package de.juplo.kafka.chat.backend.
persistence.inmemory
;
import java.util.UUID;
import java.util.UUID;
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
11542ed
..
bdca9b7
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,5
+1,8
@@
-package de.juplo.kafka.chat.backend.
domain
;
+package de.juplo.kafka.chat.backend.
persistence.inmemory
;
+import de.juplo.kafka.chat.backend.domain.ChatHome;
+import de.juplo.kafka.chat.backend.domain.ChatRoom;
+import de.juplo.kafka.chat.backend.domain.UnknownChatroomException;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
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/persistence/storage/files/FilesStorageConfiguration.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageConfiguration.java
index
702d1d5
..
11b6440
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageConfiguration.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageConfiguration.java
@@
-2,7
+2,7
@@
package de.juplo.kafka.chat.backend.persistence.storage.files;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.juplo.kafka.chat.backend.ChatBackendProperties;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.juplo.kafka.chat.backend.ChatBackendProperties;
-import de.juplo.kafka.chat.backend.
domain
.ShardingStrategy;
+import de.juplo.kafka.chat.backend.
persistence.inmemory
.ShardingStrategy;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomService;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomService;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageStrategy.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageStrategy.java
index
f0ee1df
..
025e3ae
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageStrategy.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageStrategy.java
@@
-5,7
+5,7
@@
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.juplo.kafka.chat.backend.api.ChatRoomInfoTo;
import de.juplo.kafka.chat.backend.api.MessageTo;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.juplo.kafka.chat.backend.api.ChatRoomInfoTo;
import de.juplo.kafka.chat.backend.api.MessageTo;
-import de.juplo.kafka.chat.backend.
domain
.ShardingStrategy;
+import de.juplo.kafka.chat.backend.
persistence.inmemory
.ShardingStrategy;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
import de.juplo.kafka.chat.backend.domain.Message;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
import de.juplo.kafka.chat.backend.domain.Message;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageConfiguration.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageConfiguration.java
index
2b33eed
..
9ef38a7
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageConfiguration.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageConfiguration.java
@@
-1,7
+1,7
@@
package de.juplo.kafka.chat.backend.persistence.storage.mongodb;
import de.juplo.kafka.chat.backend.ChatBackendProperties;
package de.juplo.kafka.chat.backend.persistence.storage.mongodb;
import de.juplo.kafka.chat.backend.ChatBackendProperties;
-import de.juplo.kafka.chat.backend.
domain
.ShardingStrategy;
+import de.juplo.kafka.chat.backend.
persistence.inmemory
.ShardingStrategy;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageStrategy.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageStrategy.java
index
d21fe2b
..
d3a18bc
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageStrategy.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/mongodb/MongoDbStorageStrategy.java
@@
-1,6
+1,6
@@
package de.juplo.kafka.chat.backend.persistence.storage.mongodb;
package de.juplo.kafka.chat.backend.persistence.storage.mongodb;
-import de.juplo.kafka.chat.backend.
domain
.ShardingStrategy;
+import de.juplo.kafka.chat.backend.
persistence.inmemory
.ShardingStrategy;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.persistence.storage.files.ChatRoomServiceFactory;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.persistence.storage.files.ChatRoomServiceFactory;
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/nostorage/NoStorageStorageConfiguration.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/storage/nostorage/NoStorageStorageConfiguration.java
index
824c6f2
..
ffed299
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/nostorage/NoStorageStorageConfiguration.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/nostorage/NoStorageStorageConfiguration.java
@@
-1,11
+1,7
@@
package de.juplo.kafka.chat.backend.persistence.storage.nostorage;
package de.juplo.kafka.chat.backend.persistence.storage.nostorage;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import de.juplo.kafka.chat.backend.ChatBackendProperties;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
-import de.juplo.kafka.chat.backend.domain.ShardingStrategy;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
-import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomService;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
@@
-14,9
+10,6
@@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import reactor.core.publisher.Flux;
import org.springframework.context.annotation.Configuration;
import reactor.core.publisher.Flux;
-import java.nio.file.Paths;
-import java.time.Clock;
-
@ConditionalOnProperty(
prefix = "chat.backend.inmemory",
@ConditionalOnProperty(
prefix = "chat.backend.inmemory",
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
f66be45
..
5df4314
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
@@
-3,6
+3,7
@@
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.persistence.inmemory.InMemoryChatHomeService;
import de.juplo.kafka.chat.backend.ChatBackendProperties;
import de.juplo.kafka.chat.backend.domain.*;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatHomeService;
+import de.juplo.kafka.chat.backend.persistence.inmemory.ShardingStrategy;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
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/persistence/AbstractInMemoryStorageIT.java
b/src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractInMemoryStorageIT.java
index
dd76324
..
a4defeb
100644
(file)
--- a/
src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractInMemoryStorageIT.java
+++ b/
src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractInMemoryStorageIT.java
@@
-1,6
+1,6
@@
package de.juplo.kafka.chat.backend.persistence;
package de.juplo.kafka.chat.backend.persistence;
-import de.juplo.kafka.chat.backend.
domain
.ChatHomeService;
+import de.juplo.kafka.chat.backend.
persistence.inmemory
.ChatHomeService;
import de.juplo.kafka.chat.backend.domain.ChatRoomFactory;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatHomeService;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomFactory;
import de.juplo.kafka.chat.backend.domain.ChatRoomFactory;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatHomeService;
import de.juplo.kafka.chat.backend.persistence.inmemory.InMemoryChatRoomFactory;
diff --git
a/src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
b/src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
index
3ce527e
..
1373cf0
100644
(file)
--- a/
src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
+++ b/
src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
@@
-1,6
+1,8
@@
package de.juplo.kafka.chat.backend.persistence;
import de.juplo.kafka.chat.backend.domain.*;
package de.juplo.kafka.chat.backend.persistence;
import de.juplo.kafka.chat.backend.domain.*;
+import de.juplo.kafka.chat.backend.persistence.inmemory.ChatHomeService;
+import de.juplo.kafka.chat.backend.persistence.inmemory.SimpleChatHome;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
diff --git
a/src/test/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHomeTest.java
b/src/test/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHomeTest.java
index
5b53607
..
418373a
100644
(file)
--- a/
src/test/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHomeTest.java
+++ b/
src/test/java/de/juplo/kafka/chat/backend/persistence/inmemory/SimpleChatHomeTest.java
@@
-1,5
+1,9
@@
-package de.juplo.kafka.chat.backend.
domain
;
+package de.juplo.kafka.chat.backend.
persistence.inmemory
;
+import de.juplo.kafka.chat.backend.domain.ChatRoom;
+import de.juplo.kafka.chat.backend.domain.ChatRoomService;
+import de.juplo.kafka.chat.backend.persistence.inmemory.ChatHomeService;
+import de.juplo.kafka.chat.backend.persistence.inmemory.SimpleChatHome;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;