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:
182a9d3
)
refactor: Refined (simplified) `StorageStrategy`
author
Kai Moritz
<kai@juplo.de>
Mon, 9 Jan 2023 21:46:42 +0000
(22:46 +0100)
committer
Kai Moritz
<kai@juplo.de>
Wed, 25 Jan 2023 20:59:37 +0000
(21:59 +0100)
src/main/java/de/juplo/kafka/chat/backend/ChatBackendApplication.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/StorageStrategy.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/chat/backend/persistence/storage/files/FilesStorageStrategy.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/InMemoryWithFilesStorageStrategyIT.java
patch
|
blob
|
history
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/ChatBackendApplication.java
b/src/main/java/de/juplo/kafka/chat/backend/ChatBackendApplication.java
index
80a46c0
..
c61f848
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/ChatBackendApplication.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/ChatBackendApplication.java
@@
-32,7
+32,7
@@
public class ChatBackendApplication implements WebFluxConfigurer
@PreDestroy
public void onExit()
{
@PreDestroy
public void onExit()
{
- storageStrategy.write
Chatrooms
(chatHome.getChatRooms());
+ storageStrategy.write(chatHome.getChatRooms());
}
public static void main(String[] args)
}
public static void main(String[] args)
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
b/src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
index
dcf2d9f
..
87965ab
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/ChatBackendConfiguration.java
@@
-32,7
+32,7
@@
public class ChatBackendConfiguration
ChatBackendProperties properties)
{
return new InMemoryChatHomeService(
ChatBackendProperties properties)
{
return new InMemoryChatHomeService(
- storageStrategy.read
Chatrooms
(),
+ storageStrategy.read(),
clock,
properties.getChatroomBufferSize());
}
clock,
properties.getChatroomBufferSize());
}
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
index
e7a6f1a
..
3b8fc84
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
@@
-124,6
+124,6
@@
public class ChatBackendController
@PostMapping("/store")
public void store()
{
@PostMapping("/store")
public void store()
{
- storageStrategy.write
Chatrooms
(chatHome.getChatRooms());
+ storageStrategy.write(chatHome.getChatRooms());
}
}
}
}
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/persistence/StorageStrategy.java
b/src/main/java/de/juplo/kafka/chat/backend/persistence/StorageStrategy.java
index
4355f9f
..
bedd0aa
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/persistence/StorageStrategy.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/persistence/StorageStrategy.java
@@
-1,15
+1,11
@@
package de.juplo.kafka.chat.backend.persistence;
package de.juplo.kafka.chat.backend.persistence;
-import de.juplo.kafka.chat.backend.api.ChatRoomTo;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
-import de.juplo.kafka.chat.backend.domain.Message;
import reactor.core.publisher.Flux;
public interface StorageStrategy
{
import reactor.core.publisher.Flux;
public interface StorageStrategy
{
- void writeChatrooms(Flux<ChatRoom> chatroomFlux);
- Flux<ChatRoom> readChatrooms();
- void writeMessages(ChatRoomTo chatroomTo, Flux<Message> messageFlux);
- Flux<Message> readMessages(ChatRoomTo chatroomTo);
+ void write(Flux<ChatRoom> chatroomFlux);
+ Flux<ChatRoom> read();
}
}
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
e670970
..
1fd307f
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
@@
-36,7
+36,7
@@
public class FilesStorageStrategy implements StorageStrategy
@Override
@Override
- public void write
Chatrooms
(Flux<ChatRoom> chatroomFlux)
+ public void write(Flux<ChatRoom> chatroomFlux)
{
Path path = chatroomsPath();
log.info("Writing chatrooms to {}", path);
{
Path path = chatroomsPath();
log.info("Writing chatrooms to {}", path);
@@
-96,7
+96,7
@@
public class FilesStorageStrategy implements StorageStrategy
}
@Override
}
@Override
- public Flux<ChatRoom> read
Chatrooms
()
+ public Flux<ChatRoom> read()
{
JavaType type = mapper.getTypeFactory().constructType(ChatRoomTo.class);
return Flux
{
JavaType type = mapper.getTypeFactory().constructType(ChatRoomTo.class);
return Flux
@@
-110,7
+110,6
@@
public class FilesStorageStrategy implements StorageStrategy
bufferSize));
}
bufferSize));
}
- @Override
public void writeMessages(ChatRoomTo chatroomTo, Flux<Message> messageFlux)
{
Path path = chatroomPath(chatroomTo);
public void writeMessages(ChatRoomTo chatroomTo, Flux<Message> messageFlux)
{
Path path = chatroomPath(chatroomTo);
@@
-169,7
+168,6
@@
public class FilesStorageStrategy implements StorageStrategy
}
}
}
}
- @Override
public Flux<Message> readMessages(ChatRoomTo chatroomTo)
{
JavaType type = mapper.getTypeFactory().constructType(MessageTo.class);
public Flux<Message> readMessages(ChatRoomTo chatroomTo)
{
JavaType type = mapper.getTypeFactory().constructType(MessageTo.class);
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
b2cbde2
..
549faad
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
@@
-29,7
+29,7
@@
public abstract class AbstractStorageStrategyIT
protected void stop()
{
protected void stop()
{
- getStorageStrategy().write
Chatrooms
(chathome.getChatRooms());
+ getStorageStrategy().write(chathome.getChatRooms());
}
@Test
}
@Test
diff --git
a/src/test/java/de/juplo/kafka/chat/backend/persistence/InMemoryWithFilesStorageStrategyIT.java
b/src/test/java/de/juplo/kafka/chat/backend/persistence/InMemoryWithFilesStorageStrategyIT.java
index
f182c82
..
93bfc8f
100644
(file)
--- a/
src/test/java/de/juplo/kafka/chat/backend/persistence/InMemoryWithFilesStorageStrategyIT.java
+++ b/
src/test/java/de/juplo/kafka/chat/backend/persistence/InMemoryWithFilesStorageStrategyIT.java
@@
-52,7
+52,7
@@
public class InMemoryWithFilesStorageStrategyIT extends AbstractStorageStrategyI
@Override
protected Supplier<ChatHomeService> chatHomeServiceSupplier()
{
@Override
protected Supplier<ChatHomeService> chatHomeServiceSupplier()
{
- return () -> new InMemoryChatHomeService(getStorageStrategy().read
Chatrooms
(), clock, 8);
+ return () -> new InMemoryChatHomeService(getStorageStrategy().read(), clock, 8);
}
@BeforeEach
}
@BeforeEach