From ae76024011a8442ae7eab953e0b97e9fe2c7c201 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 25 Sep 2018 11:53:37 +0300
Subject: reorganize layout

---
 juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java | 6 +++---
 juick-server/src/main/java/com/juick/server/api/Messages.java       | 5 ++---
 juick-server/src/main/java/com/juick/server/api/Notifications.java  | 2 +-
 juick-server/src/main/java/com/juick/server/api/PM.java             | 6 +++---
 juick-server/src/main/java/com/juick/server/api/Post.java           | 2 +-
 juick-server/src/main/java/com/juick/server/api/Tags.java           | 2 +-
 juick-server/src/main/java/com/juick/server/api/Users.java          | 4 ++--
 .../src/main/java/com/juick/server/api/rss/RepliesView.java         | 2 +-
 8 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'juick-server/src/main/java/com/juick/server/api')

diff --git a/juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java b/juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java
index 2e484e3d..8d9f9402 100644
--- a/juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java
+++ b/juick-server/src/main/java/com/juick/server/api/ApiSocialLogin.java
@@ -24,13 +24,13 @@ import com.github.scribejava.core.model.OAuth2AccessToken;
 import com.github.scribejava.core.model.OAuthRequest;
 import com.github.scribejava.core.model.Verb;
 import com.github.scribejava.core.oauth.OAuth20Service;
-import com.juick.facebook.User;
+import com.juick.model.facebook.User;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.service.CrosspostService;
 import com.juick.service.EmailService;
 import com.juick.service.TelegramService;
 import com.juick.service.UserService;
-import com.juick.vk.UsersResponse;
+import com.juick.model.vk.UsersResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
@@ -244,7 +244,7 @@ public class ApiSocialLogin {
         vkService.signRequest(token, meRequest);
         String graph = vkService.execute(meRequest).getBody();
 
-        com.juick.vk.User jsonUser = jsonMapper.readValue(graph, UsersResponse.class).getUsers().get(0);
+        com.juick.model.vk.User jsonUser = jsonMapper.readValue(graph, UsersResponse.class).getUsers().get(0);
         String vkName = jsonUser.getFirstName() + " " + jsonUser.getLastName();
         String vkLink = jsonUser.getScreenName();
 
diff --git a/juick-server/src/main/java/com/juick/server/api/Messages.java b/juick-server/src/main/java/com/juick/server/api/Messages.java
index e900810f..86f9a20d 100644
--- a/juick-server/src/main/java/com/juick/server/api/Messages.java
+++ b/juick-server/src/main/java/com/juick/server/api/Messages.java
@@ -21,15 +21,14 @@ import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
 import com.juick.server.Utils;
-import com.juick.server.component.MessageReadEvent;
-import com.juick.server.helpers.CommandResult;
+import com.juick.service.component.MessageReadEvent;
+import com.juick.model.CommandResult;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.server.util.HttpNotFoundException;
 import com.juick.server.util.UserUtils;
 import com.juick.service.MessagesService;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
-import com.juick.service.security.entities.JuickUser;
 import org.apache.commons.io.IOUtils;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.HttpStatus;
diff --git a/juick-server/src/main/java/com/juick/server/api/Notifications.java b/juick-server/src/main/java/com/juick/server/api/Notifications.java
index 0b34f275..b0d64292 100644
--- a/juick-server/src/main/java/com/juick/server/api/Notifications.java
+++ b/juick-server/src/main/java/com/juick/server/api/Notifications.java
@@ -21,7 +21,7 @@ import com.juick.Message;
 import com.juick.Status;
 import com.juick.ExternalToken;
 import com.juick.User;
-import com.juick.server.helpers.AnonymousUser;
+import com.juick.model.AnonymousUser;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.server.util.HttpForbiddenException;
 import com.juick.service.MessagesService;
diff --git a/juick-server/src/main/java/com/juick/server/api/PM.java b/juick-server/src/main/java/com/juick/server/api/PM.java
index d3619662..80be92f0 100644
--- a/juick-server/src/main/java/com/juick/server/api/PM.java
+++ b/juick-server/src/main/java/com/juick/server/api/PM.java
@@ -18,9 +18,9 @@
 package com.juick.server.api;
 
 import com.juick.User;
-import com.juick.server.component.MessageEvent;
-import com.juick.server.helpers.AnonymousUser;
-import com.juick.server.helpers.PrivateChats;
+import com.juick.service.component.MessageEvent;
+import com.juick.model.AnonymousUser;
+import com.juick.model.PrivateChats;
 import com.juick.server.util.*;
 import com.juick.service.PMQueriesService;
 import com.juick.service.UserService;
diff --git a/juick-server/src/main/java/com/juick/server/api/Post.java b/juick-server/src/main/java/com/juick/server/api/Post.java
index 99d118c3..d6f085bb 100644
--- a/juick-server/src/main/java/com/juick/server/api/Post.java
+++ b/juick-server/src/main/java/com/juick/server/api/Post.java
@@ -22,7 +22,7 @@ import com.juick.Reaction;
 import com.juick.Status;
 import com.juick.User;
 import com.juick.server.CommandsManager;
-import com.juick.server.helpers.CommandResult;
+import com.juick.model.CommandResult;
 import com.juick.server.util.*;
 import com.juick.service.MessagesService;
 import com.juick.service.SubscriptionService;
diff --git a/juick-server/src/main/java/com/juick/server/api/Tags.java b/juick-server/src/main/java/com/juick/server/api/Tags.java
index 38e71e3a..7a8e572a 100644
--- a/juick-server/src/main/java/com/juick/server/api/Tags.java
+++ b/juick-server/src/main/java/com/juick/server/api/Tags.java
@@ -18,7 +18,7 @@
 package com.juick.server.api;
 
 import com.juick.User;
-import com.juick.server.helpers.TagStats;
+import com.juick.model.TagStats;
 import com.juick.server.util.UserUtils;
 import com.juick.service.TagService;
 import org.springframework.http.MediaType;
diff --git a/juick-server/src/main/java/com/juick/server/api/Users.java b/juick-server/src/main/java/com/juick/server/api/Users.java
index de5c05c2..7686d722 100644
--- a/juick-server/src/main/java/com/juick/server/api/Users.java
+++ b/juick-server/src/main/java/com/juick/server/api/Users.java
@@ -18,8 +18,8 @@
 package com.juick.server.api;
 
 import com.juick.User;
-import com.juick.server.helpers.ApplicationStatus;
-import com.juick.server.helpers.UserInfo;
+import com.juick.model.ApplicationStatus;
+import com.juick.model.UserInfo;
 import com.juick.server.util.HttpForbiddenException;
 import com.juick.server.util.HttpNotFoundException;
 import com.juick.service.CrosspostService;
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java b/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java
index b67e8b44..f9d7109e 100644
--- a/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java
+++ b/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java
@@ -17,7 +17,7 @@
 
 package com.juick.server.api.rss;
 
-import com.juick.server.helpers.ResponseReply;
+import com.juick.model.ResponseReply;
 import com.juick.util.MessageUtils;
 import com.rometools.modules.mediarss.MediaEntryModuleImpl;
 import com.rometools.modules.mediarss.MediaModule;
-- 
cgit v1.2.3