From c9d67837cbcaae84a03b7bd14e508ca62880f87f Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sat, 7 Mar 2020 13:20:45 +0300 Subject: Reorganize project layout --- src/main/java/com/juick/server/ServerManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/juick/server/ServerManager.java') diff --git a/src/main/java/com/juick/server/ServerManager.java b/src/main/java/com/juick/server/ServerManager.java index a35a66e8..8a70251f 100644 --- a/src/main/java/com/juick/server/ServerManager.java +++ b/src/main/java/com/juick/server/ServerManager.java @@ -18,8 +18,8 @@ package com.juick.server; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.juick.Message; -import com.juick.User; +import com.juick.model.Message; +import com.juick.model.User; import com.juick.model.AnonymousUser; import com.juick.server.api.SystemActivity; import com.juick.service.MessagesService; @@ -78,16 +78,16 @@ public class ServerManager implements NotificationListener { } - private void onJuickPM(final User to, final com.juick.Message jmsg) { + private void onJuickPM(final User to, final Message jmsg) { messageEvent(jmsg, Arrays.asList(to, jmsg.getUser())); } - private void onJuickMessagePost(final com.juick.Message jmsg, List subscribedUsers) { + private void onJuickMessagePost(final Message jmsg, List subscribedUsers) { messageEvent(jmsg, subscribedUsers); messageEvent(jmsg, Collections.singletonList(AnonymousUser.INSTANCE)); } - private void onJuickMessageReply(final com.juick.Message jmsg, final List subscribedUsers) { + private void onJuickMessageReply(final Message jmsg, final List subscribedUsers) { messageEvent(jmsg, subscribedUsers); messageEvent(jmsg, Collections.singletonList(AnonymousUser.INSTANCE)); } @@ -113,7 +113,7 @@ public class ServerManager implements NotificationListener { logger.warn("JSON exception", e); } } - private void processMessage(User from, com.juick.Message jmsg, List subscribers) { + private void processMessage(User from, Message jmsg, List subscribers) { List subscribedUsers = ListUtils.union(subscribers, Collections.singletonList(jmsg.getUser())); if (jmsg.isService()) { logger.info("Message read event from {} for {}", from.getUid(), jmsg.getMid()); -- cgit v1.2.3