diff --git a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/AbstractController.java b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/AbstractController.java index 4f33d52a..85ce9df7 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/AbstractController.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/AbstractController.java @@ -30,7 +30,7 @@ public abstract class AbstractController implements MessageShowingController { protected abstract NotificationPane getNotificationPane(); protected void initNotificationPane() { - getNotificationPane().setOnHidden(e -> showNextMessage()); + getNotificationPane().setOnHidden(_ -> showNextMessage()); } @Override @@ -43,7 +43,7 @@ public void showMessages(List messages) { private void showNextMessage() { SceneChangeMessage message = queue.poll(); - if (message == null) + if (message == null) return; log.info("Showing message {}", message); diff --git a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/ChatController.java b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/ChatController.java index 75093d9f..0cbe8a21 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/ChatController.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/ChatController.java @@ -35,11 +35,11 @@ public class ChatController { public void initialize() { chatListView.setItems(chatService.getChatMessages()); senderNameTextField.setText(chatService.getCurrentUsername()); - chatListView.setCellFactory(listView -> new CustomListCell()); - chatService.getChatMessages().addListener((ListChangeListener) change -> onNewChatMessage()); - root.widthProperty().addListener((observable, oldValue, newValue) -> updateScrollDownButtonPosition()); - scrollDownButton.widthProperty().addListener((observable, oldValue, newValue) -> updateScrollDownButtonPosition()); - chatTextField.heightProperty().addListener((observable, oldValue, newValue) -> updateScrollDownButtonPosition()); + chatListView.setCellFactory(_ -> new CustomListCell()); + chatService.getChatMessages().addListener((ListChangeListener) _ -> onNewChatMessage()); + root.widthProperty().addListener((_, _, _) -> updateScrollDownButtonPosition()); + scrollDownButton.widthProperty().addListener((_, _, _) -> updateScrollDownButtonPosition()); + chatTextField.heightProperty().addListener((_, _, _) -> updateScrollDownButtonPosition()); setPaused(false); } @@ -62,7 +62,7 @@ private void onScrollDownButton() { private void onNewChatMessage() { if (verticalBar == null) { verticalBar = (ScrollBar) chatListView.lookup(".scroll-bar:vertical"); - verticalBar.valueProperty().addListener((obs, oldValue, newValue) -> + verticalBar.valueProperty().addListener((_, _, newValue) -> setPaused(newValue.doubleValue() < verticalBar.getMax()) ); } diff --git a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/LobbyController.java b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/LobbyController.java index 63137fd6..285f2688 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/LobbyController.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/LobbyController.java @@ -28,16 +28,18 @@ public void leaveLobby() { public void initialize() { userListView.setItems(lobbyService.getLobbyUsersList()); - userListView.setCellFactory(userListView -> new ListCell<>() { + userListView.setCellFactory(_ -> new ListCell<>() { @Override protected void updateItem(IUser user, boolean empty) { super.updateItem(user, empty); - IUser owner = lobbyService.getCurrentLobby().get().getOwner(); - if (empty || user == null) { - setText(null); - } else { - setText(user.getUsername() + (user.equals(owner) ? " (Owner)" : "")); - } + lobbyService.getCurrentLobby().ifPresentOrElse(lobby -> { + IUser owner = lobby.getOwner(); + if (empty || user == null) { + setText(null); + } else { + setText(user.getUsername() + (user.equals(owner) ? " (Owner)" : "")); + } + }, () -> log.warn("No lobby found")); } }); } diff --git a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/MainMenuController.java b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/MainMenuController.java index 5ff6ed39..d7419f9b 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/MainMenuController.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/MainMenuController.java @@ -41,7 +41,7 @@ public class MainMenuController { private void initialize() { lobbiesListView.setItems(sessionService.getLobbyList()); lobbiesListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE); - lobbiesListView.setCellFactory(lobbyInfoListView -> new ListCell<>() { + lobbiesListView.setCellFactory(_ -> new ListCell<>() { @Override protected void updateItem(LobbyInfo lobbyInfo, boolean empty) { super.updateItem(lobbyInfo, empty); @@ -52,7 +52,7 @@ protected void updateItem(LobbyInfo lobbyInfo, boolean empty) { } } }); - lobbiesListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> + lobbiesListView.getSelectionModel().selectedItemProperty().addListener((_, _, newValue) -> joinLobbyButton.setDisable(newValue == null) ); lobbiesListView.setOnMouseClicked(event -> { diff --git a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/RegisterController.java b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/RegisterController.java index fc4b21d7..25c31ecd 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/RegisterController.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/fx/controller/RegisterController.java @@ -31,9 +31,6 @@ public class RegisterController { @FXML private PasswordField passwordRepeatField; - // @FXML - // private JFXSnackbar snackbar; - @FXML private void handleRegister() { log.info("Register button clicked"); @@ -65,7 +62,6 @@ void onRegisterFailedResponse(RegisterFailedResponse rfr) { Platform.runLater(() -> { passwordField.setText(""); passwordRepeatField.setText(""); - // snackbar.fireEvent(new JFXSnackbar.SnackbarEvent(new JFXSnackbarLayout("Registration Failed"), Duration.seconds(2), null)); }); } } diff --git a/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/SceneController.java b/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/SceneController.java index eab27f8e..f41bb699 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/SceneController.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/SceneController.java @@ -23,37 +23,37 @@ public class SceneController { private final ApplicationEventPublisher eventBus; @EventListener - public void onLoginSuccessfulResponse(LoginSuccessfulResponse lsr) { + public void onLoginSuccessfulResponse(LoginSuccessfulResponse ignored) { eventBus.publishEvent(new SceneChangeEvent(Scene.MAIN)); } @EventListener - public void onLogoutSuccessfulResponse(LogoutSuccessfulResponse lsr) { + public void onLogoutSuccessfulResponse(LogoutSuccessfulResponse ignored) { eventBus.publishEvent(new SceneChangeEvent(Scene.LOGIN)); } @EventListener - public void onRegisterSuccessfulResponse(RegisterSuccessfulResponse rsr) { + public void onRegisterSuccessfulResponse(RegisterSuccessfulResponse ignored) { eventBus.publishEvent(new SceneChangeEvent(Scene.LOGIN)); } @EventListener - public void onLobbyCreatedSuccessfullyResponse(LobbyCreatedSuccessfullyResponse lcsr) { + public void onLobbyCreatedSuccessfullyResponse(LobbyCreatedSuccessfullyResponse ignored) { eventBus.publishEvent(new SceneChangeEvent(Scene.LOBBY)); } @EventListener - public void onJoinLobbySuccessfullyResponse(JoinLobbySuccessfullyResponse jlsr) { + public void onJoinLobbySuccessfullyResponse(JoinLobbySuccessfullyResponse ignored) { eventBus.publishEvent(new SceneChangeEvent(Scene.LOBBY)); } @EventListener - public void onLeaveLobbySuccessfullyResponse(LeaveLobbySuccessfullyResponse llsr) { + public void onLeaveLobbySuccessfullyResponse(LeaveLobbySuccessfullyResponse ignored) { eventBus.publishEvent(new SceneChangeEvent(Scene.MAIN)); } @EventListener - public void onDeletionSuccessfulResponse(DeletionSuccessfulResponse dsr) { + public void onDeletionSuccessfulResponse(DeletionSuccessfulResponse ignored) { eventBus.publishEvent(new SceneChangeEvent(Scene.LOGIN, SceneChangeMessage.USER_DELETED_SUCCESSFULLY)); } diff --git a/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/events/SceneChangeEventType.java b/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/events/SceneChangeEventType.java index 8ffcbe69..2f4fe300 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/events/SceneChangeEventType.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/fx/scene/events/SceneChangeEventType.java @@ -5,6 +5,6 @@ public enum SceneChangeEventType { SUCCESS, WARNING, ERROR, - INFO; + INFO } diff --git a/client/src/main/java/org/schlunzis/kurtama/client/net/impl/NettyClient.java b/client/src/main/java/org/schlunzis/kurtama/client/net/impl/NettyClient.java index 866008bd..dd689ea4 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/net/impl/NettyClient.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/net/impl/NettyClient.java @@ -62,8 +62,7 @@ public void start() { log.info("Connection cancelled by user."); close(ConnectionStatusEvent.Status.NOT_CONNECTED); } else if (!f.isSuccess()) { - log.error("Connection failed!"); - f.cause().printStackTrace(); + log.error("Connection failed!", f.cause()); close(ConnectionStatusEvent.Status.FAILED); } else { log.info("Connected to server."); diff --git a/client/src/main/java/org/schlunzis/kurtama/client/service/impl/ChatService.java b/client/src/main/java/org/schlunzis/kurtama/client/service/impl/ChatService.java index 08bf3150..cf1ebaf4 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/service/impl/ChatService.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/service/impl/ChatService.java @@ -52,7 +52,7 @@ public void onJoinLobbySuccessfullyResponse(JoinLobbySuccessfullyResponse jlsr) } @EventListener - public void onLeaveLobbySuccessfullyResponse(LeaveLobbySuccessfullyResponse llsr) { + public void onLeaveLobbySuccessfullyResponse(LeaveLobbySuccessfullyResponse ignored) { currentChatID = GLOBAL_CHAT_ID; } diff --git a/client/src/main/java/org/schlunzis/kurtama/client/util/I18n.java b/client/src/main/java/org/schlunzis/kurtama/client/util/I18n.java index e2b757f3..a4538b88 100644 --- a/client/src/main/java/org/schlunzis/kurtama/client/util/I18n.java +++ b/client/src/main/java/org/schlunzis/kurtama/client/util/I18n.java @@ -87,7 +87,7 @@ private void init() { * Extracts the locale from the filename of a language file. *

* The filename is expected to be in the format "messages_{languageTag}.properties". - * Example: "messages_de_DE.properties" -> {@link Locale.GERMANY} + * Example: "messages_de_DE.properties" -> {@link Locale#GERMANY} * * @param filename the filename of the language file * @return the locale extracted from the filename diff --git a/server/src/main/java/org/schlunzis/kurtama/server/auth/UserSessionMap.java b/server/src/main/java/org/schlunzis/kurtama/server/auth/UserSessionMap.java index 0507278d..4d73d80a 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/auth/UserSessionMap.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/auth/UserSessionMap.java @@ -1,5 +1,6 @@ package org.schlunzis.kurtama.server.auth; +import lombok.NonNull; import org.schlunzis.kurtama.server.net.ISession; import org.schlunzis.kurtama.server.user.ServerUser; import org.schlunzis.zis.commons.collections.BiMap; @@ -7,7 +8,6 @@ import org.springframework.stereotype.Component; import java.util.Collection; -import java.util.Objects; import java.util.Optional; @Component @@ -15,24 +15,19 @@ class UserSessionMap { private final BiMap map = new ConcurrentBiHashMap<>(); - public void put(ServerUser user, ISession session) { - Objects.requireNonNull(user); - Objects.requireNonNull(session); + public void put(@NonNull ServerUser user, @NonNull ISession session) { map.put(user, session); } - public Optional get(ServerUser user) { - Objects.requireNonNull(user); + public Optional get(@NonNull ServerUser user) { return Optional.ofNullable(map.get(user)); } - public Optional get(ISession session) { - Objects.requireNonNull(session); + public Optional get(@NonNull ISession session) { return Optional.ofNullable(map.getByValue(session)); } - public Collection getFor(Collection users) { - Objects.requireNonNull(users); + public Collection getFor(@NonNull Collection users) { return map.getForKeys(users); } @@ -40,18 +35,15 @@ public Collection getAllSessions() { return map.values(); } - public boolean contains(ISession session) { - Objects.requireNonNull(session); + public boolean contains(@NonNull ISession session) { return map.containsValue(session); } - public void remove(ServerUser user) { - Objects.requireNonNull(user); + public void remove(@NonNull ServerUser user) { map.remove(user); } - public void remove(ISession session) { - Objects.requireNonNull(session); + public void remove(@NonNull ISession session) { map.removeByValue(session); } diff --git a/server/src/main/java/org/schlunzis/kurtama/server/chat/Chat.java b/server/src/main/java/org/schlunzis/kurtama/server/chat/Chat.java index 17ca0e0b..3785a717 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/chat/Chat.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/chat/Chat.java @@ -2,12 +2,12 @@ import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.NonNull; import lombok.RequiredArgsConstructor; import org.schlunzis.kurtama.server.user.ServerUser; import java.util.ArrayList; import java.util.Collection; -import java.util.Objects; import java.util.UUID; @EqualsAndHashCode @@ -18,15 +18,13 @@ public class Chat { private final UUID id; private final Collection chatters = new ArrayList<>(); - void addChatter(ServerUser user) { - Objects.requireNonNull(user); + void addChatter(@NonNull ServerUser user) { if (!chatters.contains(user)) { chatters.add(user); } } - void removeChatter(ServerUser user) { - Objects.requireNonNull(user); + void removeChatter(@NonNull ServerUser user) { chatters.remove(user); } diff --git a/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatManagement.java b/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatManagement.java index c7bae777..58a00a05 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatManagement.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatManagement.java @@ -1,13 +1,16 @@ package org.schlunzis.kurtama.server.chat; +import lombok.Locked; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.schlunzis.kurtama.server.user.ServerUser; import org.springframework.stereotype.Component; -import java.util.*; -import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; @Slf4j @Component @@ -21,77 +24,46 @@ public class ChatManagement { */ private final Map lobbyChatMap = new HashMap<>(); - private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); - private final ReentrantReadWriteLock.ReadLock readLock = lock.readLock(); - private final ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock(); - - public Chat createLobbyChat(UUID lobbyID) { - Objects.requireNonNull(lobbyID); - writeLock.lock(); - try { - Chat chat = chatStore.create(); - lobbyChatMap.put(lobbyID, chat.getId()); - return chat; - } finally { - writeLock.unlock(); - } + @Locked.Write + public Chat createLobbyChat(@NonNull UUID lobbyID) { + Chat chat = chatStore.create(); + lobbyChatMap.put(lobbyID, chat.getId()); + return chat; } - public Optional getLobbyChat(UUID lobbyID) { - Objects.requireNonNull(lobbyID); - readLock.lock(); - try { - UUID chatID = lobbyChatMap.get(lobbyID); - if (chatID == null) - return Optional.empty(); - return chatStore.get(chatID); - } finally { - readLock.unlock(); - } + @Locked.Read + public Optional getLobbyChat(@NonNull UUID lobbyID) { + UUID chatID = lobbyChatMap.get(lobbyID); + if (chatID == null) + return Optional.empty(); + return chatStore.get(chatID); } - public void removeLobbyChat(UUID lobbyID) { - Objects.requireNonNull(lobbyID); - writeLock.lock(); - try { - chatStore.remove(lobbyChatMap.get(lobbyID)); - lobbyChatMap.remove(lobbyID); - } finally { - writeLock.unlock(); - } + @Locked.Write + public void removeLobbyChat(@NonNull UUID lobbyID) { + chatStore.remove(lobbyChatMap.get(lobbyID)); + lobbyChatMap.remove(lobbyID); } - public Optional getChat(UUID chatID) { - readLock.lock(); - try { - return chatStore.get(chatID); - } finally { - readLock.unlock(); - } + @Locked.Read + public Optional getChat(@NonNull UUID chatID) { + return chatStore.get(chatID); } + @Locked.Write public void addChatter(@NonNull UUID chatID, @NonNull ServerUser user) { - writeLock.lock(); - try { - chatStore.get(chatID).ifPresentOrElse( - chat -> chat.addChatter(user), - () -> log.warn("Could not add user to chat. No chat with id {} found", chatID) - ); - } finally { - writeLock.unlock(); - } + chatStore.get(chatID).ifPresentOrElse( + chat -> chat.addChatter(user), + () -> log.warn("Could not add user to chat. No chat with id {} found", chatID) + ); } + @Locked.Write public void removeChatter(@NonNull UUID chatID, @NonNull ServerUser user) { - writeLock.lock(); - try { - chatStore.get(chatID).ifPresentOrElse( - chat -> chat.removeChatter(user), - () -> log.warn("Could not remove user from chat. No chat with id {} found", chatID) - ); - } finally { - writeLock.unlock(); - } + chatStore.get(chatID).ifPresentOrElse( + chat -> chat.removeChatter(user), + () -> log.warn("Could not remove user from chat. No chat with id {} found", chatID) + ); } } diff --git a/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatStore.java b/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatStore.java index e43900b7..f547c180 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatStore.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/chat/ChatStore.java @@ -1,8 +1,12 @@ package org.schlunzis.kurtama.server.chat; +import lombok.NonNull; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; @Component class ChatStore { @@ -20,13 +24,11 @@ public Chat create() { return chat; } - public void remove(UUID uuid) { - Objects.requireNonNull(uuid); + public void remove(@NonNull UUID uuid) { chats.remove(uuid); } - public Optional get(UUID uuid) { - Objects.requireNonNull(uuid); + public Optional get(@NonNull UUID uuid) { return Optional.ofNullable(chats.get(uuid)); } diff --git a/server/src/main/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcher.java b/server/src/main/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcher.java index 3050f85e..5c8bf1b7 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcher.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcher.java @@ -1,5 +1,6 @@ package org.schlunzis.kurtama.server.net; +import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.schlunzis.kurtama.common.messages.IClientMessage; @@ -12,7 +13,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; -import java.util.Objects; import java.util.Optional; @Slf4j @@ -24,9 +24,7 @@ public class ClientMessageDispatcher { private final ApplicationEventPublisher eventBus; - public void dispatch(IClientMessage clientMessage, ISession session) { - Objects.requireNonNull(clientMessage); - Objects.requireNonNull(session); + public void dispatch(@NonNull IClientMessage clientMessage, @NonNull ISession session) { log.info("going to dispatch message {}", clientMessage); if (clientMessage instanceof LoginRequest || clientMessage instanceof RegisterRequest) { // no authentication needed @@ -44,15 +42,14 @@ public void dispatch(IClientMessage clientMessage, ISession session) { } private void publishContext(IClientMessage clientMessage, ISession session, ServerUser user) { - eventBus.publishEvent(new ClientMessageContext<>(clientMessage, session, user, authenticationService, eventBus)); + eventBus.publishEvent(new ClientMessageContext<>(clientMessage, session, user, authenticationService)); } public void newClient(ISession session) { // some things could be done here } - public void clientDisconnected(ISession session) { - Objects.requireNonNull(session); + public void clientDisconnected(@NonNull ISession session) { eventBus.publishEvent(new ForcedLogoutEvent(session)); } diff --git a/server/src/main/java/org/schlunzis/kurtama/server/net/NetworkService.java b/server/src/main/java/org/schlunzis/kurtama/server/net/NetworkService.java index a278da0e..b21fff3c 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/net/NetworkService.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/net/NetworkService.java @@ -1,5 +1,6 @@ package org.schlunzis.kurtama.server.net; +import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.schlunzis.kurtama.common.messages.IServerMessage; @@ -25,9 +26,7 @@ public class NetworkService { * @param server the server to register * @return the previous server registered for this session. empty if no server was registered before. */ - public Optional addServer(SessionType sessionType, INetworkServer server) { - Objects.requireNonNull(sessionType); - Objects.requireNonNull(server); + public Optional addServer(@NonNull SessionType sessionType, @NonNull INetworkServer server) { return Optional.ofNullable(servers.put(sessionType, server)); } diff --git a/server/src/main/java/org/schlunzis/kurtama/server/net/netty/ServerHandler.java b/server/src/main/java/org/schlunzis/kurtama/server/net/netty/ServerHandler.java index 43c937d4..4d641170 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/net/netty/ServerHandler.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/net/netty/ServerHandler.java @@ -31,7 +31,7 @@ public class ServerHandler extends SimpleChannelInboundHandler { @Override public void channelActive(final ChannelHandlerContext ctx) { - log.info("Client joined - " + ctx); + log.info("Client joined - {}", ctx); ISession session = channelStore.create(ctx.channel()); clientMessageDispatcher.newClient(session); } @@ -40,8 +40,8 @@ public void channelActive(final ChannelHandlerContext ctx) { public void handlerRemoved(ChannelHandlerContext ctx) { channelStore.get(ctx.channel()).ifPresentOrElse( clientMessageDispatcher::clientDisconnected, - () -> log.error("No session found for channel " + ctx.channel())); - log.info("Client left - " + ctx); + () -> log.error("No session found for channel {}", ctx.channel())); + log.info("Client left - {}", ctx); channelStore.remove(ctx.channel()); ctx.close(); } @@ -49,12 +49,12 @@ public void handlerRemoved(ChannelHandlerContext ctx) { @Override public void channelRead0(ChannelHandlerContext ctx, String msg) { try { - log.info("Message received: " + msg); + log.info("Message received: {}", msg); IClientMessage myMessage = messageConverter.toClientMessage(msg); log.info("converted to {}", myMessage); channelStore.get(ctx.channel()).ifPresentOrElse( session -> clientMessageDispatcher.dispatch(myMessage, session), - () -> log.error("No session found for channel " + ctx.channel()) + () -> log.error("No session found for channel {}", ctx.channel()) ); } catch (Throwable t) { log.error("Error during message conversion occurred:", t); @@ -63,7 +63,7 @@ public void channelRead0(ChannelHandlerContext ctx, String msg) { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - log.info("Closing connection for client - " + ctx); + log.info("Closing connection for client - {}", ctx); channelStore.remove(ctx.channel()); ctx.close(); } @@ -76,8 +76,8 @@ public void sendMessage(IServerMessage serverMessage) { /** * Sends a message to all recipients. If recipients is empty, the message is sent to all clients. * - * @param serverMessage - * @param recipients + * @param serverMessage the message to send + * @param recipients the recipients to send the message to */ public void sendMessage(IServerMessage serverMessage, Collection recipients) { if (recipients.isEmpty()) diff --git a/server/src/main/java/org/schlunzis/kurtama/server/service/ClientMessageContext.java b/server/src/main/java/org/schlunzis/kurtama/server/service/ClientMessageContext.java index 8d146075..1e8e7728 100644 --- a/server/src/main/java/org/schlunzis/kurtama/server/service/ClientMessageContext.java +++ b/server/src/main/java/org/schlunzis/kurtama/server/service/ClientMessageContext.java @@ -36,7 +36,7 @@ public class ClientMessageContext extends AbstractMess private final T clientMessage; - public ClientMessageContext(T clientMessage, ISession session, ServerUser user, IAuthenticationService authenticationService, ApplicationEventPublisher eventBus) { + public ClientMessageContext(T clientMessage, ISession session, ServerUser user, IAuthenticationService authenticationService) { super(new ResponseAssembler(clientMessage), authenticationService, session, user); this.clientMessage = clientMessage; } diff --git a/server/src/test/java/org/schlunzis/kurtama/server/auth/AuthenticationServiceTest.java b/server/src/test/java/org/schlunzis/kurtama/server/auth/AuthenticationServiceTest.java index c8a36715..79ac2461 100644 --- a/server/src/test/java/org/schlunzis/kurtama/server/auth/AuthenticationServiceTest.java +++ b/server/src/test/java/org/schlunzis/kurtama/server/auth/AuthenticationServiceTest.java @@ -80,8 +80,6 @@ class AuthenticationServiceTest { @Captor ArgumentCaptor serverMessageCaptor; @Captor - ArgumentCaptor messageWrapperCaptor; - @Captor ArgumentCaptor dbUserCaptor; @BeforeEach diff --git a/server/src/test/java/org/schlunzis/kurtama/server/chat/ChatManagementTest.java b/server/src/test/java/org/schlunzis/kurtama/server/chat/ChatManagementTest.java index d52b0803..ddad3eba 100644 --- a/server/src/test/java/org/schlunzis/kurtama/server/chat/ChatManagementTest.java +++ b/server/src/test/java/org/schlunzis/kurtama/server/chat/ChatManagementTest.java @@ -158,7 +158,6 @@ void getChatDefaultTest() { @Test void getChatNullTest() { - when(chatStore.get(null)).thenThrow(NullPointerException.class); assertThrows(NullPointerException.class, () -> chatManagement.getChat(null)); } diff --git a/server/src/test/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcherTest.java b/server/src/test/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcherTest.java index 5be4779c..b64452ed 100644 --- a/server/src/test/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcherTest.java +++ b/server/src/test/java/org/schlunzis/kurtama/server/net/ClientMessageDispatcherTest.java @@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) diff --git a/server/src/test/java/org/schlunzis/kurtama/server/net/NetworkServiceTest.java b/server/src/test/java/org/schlunzis/kurtama/server/net/NetworkServiceTest.java index 30ba85b1..676045c0 100644 --- a/server/src/test/java/org/schlunzis/kurtama/server/net/NetworkServiceTest.java +++ b/server/src/test/java/org/schlunzis/kurtama/server/net/NetworkServiceTest.java @@ -16,7 +16,6 @@ import java.util.UUID; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class)