projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: Refined (simplified) `StorageStrategy`
[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
31a2035
..
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
@@
-2,7
+2,6
@@
package de.juplo.kafka.chat.backend.api;
import de.juplo.kafka.chat.backend.domain.ChatHome;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
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 de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import lombok.RequiredArgsConstructor;
import org.springframework.http.codec.ServerSentEvent;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import lombok.RequiredArgsConstructor;
import org.springframework.http.codec.ServerSentEvent;
@@
-10,9
+9,7
@@
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-import java.util.Optional;
import java.util.UUID;
import java.util.UUID;
-import java.util.stream.Stream;
@RestController
@RestController
@@
-24,32
+21,31
@@
public class ChatBackendController
@PostMapping("create")
@PostMapping("create")
- public
ChatRoomTo
create(@RequestBody String name)
+ public
Mono<ChatRoomTo>
create(@RequestBody String name)
{
{
- return
ChatRoomTo.from(chatHome.createChatroom(name)
);
+ return
chatHome.createChatroom(name).map(ChatRoomTo::from
);
}
@GetMapping("list")
}
@GetMapping("list")
- public
Stream
<ChatRoomTo> list()
+ public
Flux
<ChatRoomTo> list()
{
{
- return chatHome.
list
().map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome.
getChatRooms
().map(chatroom -> ChatRoomTo.from(chatroom));
}
@GetMapping("list/{chatroomId}")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
}
@GetMapping("list/{chatroomId}")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
- .getChat
r
oom(chatroomId)
- .
map
(chatroom -> chatroom
+ .getChat
R
oom(chatroomId)
+ .
flatMapMany
(chatroom -> chatroom
.getMessages()
.getMessages()
- .map(MessageTo::from))
- .get();
+ .map(MessageTo::from));
}
@GetMapping("get/{chatroomId}")
}
@GetMapping("get/{chatroomId}")
- public
Optional
<ChatRoomTo> get(@PathVariable UUID chatroomId)
+ public
Mono
<ChatRoomTo> get(@PathVariable UUID chatroomId)
{
{
- return chatHome.getChat
r
oom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome.getChat
R
oom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
}
@PutMapping("put/{chatroomId}/{username}/{messageId}")
}
@PutMapping("put/{chatroomId}/{username}/{messageId}")
@@
-61,9
+57,8
@@
public class ChatBackendController
{
return
chatHome
{
return
chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> put(chatroom, username, messageId, text))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMap(chatroom -> put(chatroom, username, messageId, text));
}
public Mono<MessageTo> put(
}
public Mono<MessageTo> put(
@@
-78,7
+73,6
@@
public class ChatBackendController
messageId,
username,
text)
messageId,
username,
text)
- .switchIfEmpty(chatroom.getMessage(username, messageId))
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
@@
-90,9
+84,8
@@
public class ChatBackendController
{
return
chatHome
{
return
chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> get(chatroom, username, messageId))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMap(chatroom -> get(chatroom, username, messageId));
}
private Mono<MessageTo> get(
}
private Mono<MessageTo> get(
@@
-110,9
+103,8
@@
public class ChatBackendController
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> listen(chatroom))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMapMany(chatroom -> listen(chatroom));
}
private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
}
private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
@@
-132,6
+124,6
@@
public class ChatBackendController
@PostMapping("/store")
public void store()
{
@PostMapping("/store")
public void store()
{
- storageStrategy.write
Chatrooms(Flux.fromStream(chatHome.list()
));
+ storageStrategy.write
(chatHome.getChatRooms(
));
}
}
}
}