projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP:compiles!
[demos/kafka/chat]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
chat
/
backend
/
api
/
ChatBackendController.java
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
9be7fa1
..
339451a
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
@@
-17,35
+17,32
@@
import java.util.UUID;
@RequiredArgsConstructor
public class ChatBackendController
{
@RequiredArgsConstructor
public class ChatBackendController
{
- private final ChatHome[] chatHomes;
- private final ShardingStrategy selectionStrategy;
+ private final ChatHome chatHome;
private final ChatRoomFactory factory;
private final StorageStrategy storageStrategy;
@PostMapping("create")
private final ChatRoomFactory factory;
private final StorageStrategy storageStrategy;
@PostMapping("create")
- public Mono<ChatRoomTo> create(@RequestBody String name)
+ public Mono<ChatRoom
Info
To> create(@RequestBody String name)
{
UUID chatRoomId = UUID.randomUUID();
return factory
.createChatRoom(chatRoomId, name)
{
UUID chatRoomId = UUID.randomUUID();
return factory
.createChatRoom(chatRoomId, name)
- .flatMap(chatRoom -> chatHomes[chatRoom.getShard()].putChatRoom(chatRoom))
- .map(ChatRoomTo::from);
+ .map(ChatRoomInfoTo::from);
}
@GetMapping("list")
}
@GetMapping("list")
- public Flux<ChatRoomTo> list()
+ public Flux<ChatRoom
Info
To> list()
{
{
- return Flux
- .fromArray(chatHomes)
- .flatMap(chatHome -> chatHome.getChatRooms())
- .map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome
+ .getChatRooms()
+ .map(chatroom -> ChatRoomInfoTo.from(chatroom));
}
@GetMapping("{chatroomId}/list")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
}
@GetMapping("{chatroomId}/list")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
- return chatHome
s[selectShard(chatroomId)]
+ return chatHome
.getChatRoom(chatroomId)
.flatMapMany(chatroom -> chatroom
.getMessages()
.getChatRoom(chatroomId)
.flatMapMany(chatroom -> chatroom
.getMessages()
@@
-53,11
+50,11
@@
public class ChatBackendController
}
@GetMapping("{chatroomId}")
}
@GetMapping("{chatroomId}")
- public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
+ public Mono<ChatRoom
Info
To> get(@PathVariable UUID chatroomId)
{
{
- return chatHome
s[selectShard(chatroomId)]
+ return chatHome
.getChatRoom(chatroomId)
.getChatRoom(chatroomId)
- .map(chatroom -> ChatRoomTo.from(chatroom));
+ .map(chatroom -> ChatRoom
Info
To.from(chatroom));
}
@PutMapping("{chatroomId}/{username}/{messageId}")
}
@PutMapping("{chatroomId}/{username}/{messageId}")
@@
-68,12
+65,12
@@
public class ChatBackendController
@RequestBody String text)
{
return
@RequestBody String text)
{
return
- chatHome
s[selectShard(chatroomId)]
+ chatHome
.getChatRoom(chatroomId)
.flatMap(chatroom -> put(chatroom, username, messageId, text));
}
.getChatRoom(chatroomId)
.flatMap(chatroom -> put(chatroom, username, messageId, text));
}
- p
ublic
Mono<MessageTo> put(
+ p
rivate
Mono<MessageTo> put(
ChatRoom chatroom,
String username,
Long messageId,
ChatRoom chatroom,
String username,
Long messageId,
@@
-95,7
+92,7
@@
public class ChatBackendController
@PathVariable Long messageId)
{
return
@PathVariable Long messageId)
{
return
- chatHome
s[selectShard(chatroomId)]
+ chatHome
.getChatRoom(chatroomId)
.flatMap(chatroom -> get(chatroom, username, messageId));
}
.getChatRoom(chatroomId)
.flatMap(chatroom -> get(chatroom, username, messageId));
}
@@
-114,7
+111,7
@@
public class ChatBackendController
@GetMapping(path = "{chatroomId}/listen")
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
@GetMapping(path = "{chatroomId}/listen")
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
- return chatHome
s[selectShard(chatroomId)]
+ return chatHome
.getChatRoom(chatroomId)
.flatMapMany(chatroom -> listen(chatroom));
}
.getChatRoom(chatroomId)
.flatMapMany(chatroom -> listen(chatroom));
}
@@
-136,12
+133,6
@@
public class ChatBackendController
@PostMapping("/store")
public void store()
{
@PostMapping("/store")
public void store()
{
- for (int shard = 0; shard < chatHomes.length; shard++)
- storageStrategy.write(chatHomes[shard].getChatRooms());
- }
-
- private int selectShard(UUID chatroomId)
- {
- return selectionStrategy.selectShard(chatroomId);
+ storageStrategy.write(chatHome.getChatRooms());
}
}
}
}