diff options
77 files changed, 92 insertions, 108 deletions
diff --git a/juick-common/build.gradle b/juick-common/build.gradle index e7ee0720..6c70c580 100644 --- a/juick-common/build.gradle +++ b/juick-common/build.gradle @@ -1,10 +1,7 @@ apply plugin: 'java' dependencies { - compile("org.springframework.boot:spring-boot-starter-mail") - compile("org.springframework.boot:spring-boot-starter-security") - compile("org.springframework.boot:spring-boot-starter-web") - compile("org.springframework.boot:spring-boot-starter-websocket") + compile("org.springframework.boot:spring-boot-starter-json") compile "org.apache.commons:commons-lang3:3.8.1" compile "org.apache.commons:commons-collections4:4.2" compile 'org.apache.commons:commons-text:1.4' diff --git a/juick-common/src/main/java/com/juick/server/helpers/AnonymousUser.java b/juick-common/src/main/java/com/juick/model/AnonymousUser.java index 9a201552..f4511194 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/AnonymousUser.java +++ b/juick-common/src/main/java/com/juick/model/AnonymousUser.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; import com.juick.User; diff --git a/juick-common/src/main/java/com/juick/server/helpers/ApplicationStatus.java b/juick-common/src/main/java/com/juick/model/ApplicationStatus.java index 8f57b2a6..b18e12bf 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/ApplicationStatus.java +++ b/juick-common/src/main/java/com/juick/model/ApplicationStatus.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/juick-common/src/main/java/com/juick/server/helpers/Auth.java b/juick-common/src/main/java/com/juick/model/Auth.java index d01efadd..66125567 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/Auth.java +++ b/juick-common/src/main/java/com/juick/model/Auth.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; /** * Created by vt on 09/02/16. diff --git a/juick-common/src/main/java/com/juick/server/helpers/CommandResult.java b/juick-common/src/main/java/com/juick/model/CommandResult.java index a5baaee0..c310756c 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/CommandResult.java +++ b/juick-common/src/main/java/com/juick/model/CommandResult.java @@ -1,6 +1,5 @@ -package com.juick.server.helpers; +package com.juick.model; -import com.fasterxml.jackson.annotation.JsonInclude; import com.juick.Message; import java.util.Optional; diff --git a/juick-common/src/main/java/com/juick/server/helpers/NotifyOpts.java b/juick-common/src/main/java/com/juick/model/NotifyOpts.java index 0e49a424..1c0e0aac 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/NotifyOpts.java +++ b/juick-common/src/main/java/com/juick/model/NotifyOpts.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; /** * Created by vt on 03/09/16. diff --git a/juick-common/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/juick-common/src/main/java/com/juick/model/PrivacyOpts.java index 86281d4a..52cbe588 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/PrivacyOpts.java +++ b/juick-common/src/main/java/com/juick/model/PrivacyOpts.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; /** * Created by vt on 16/01/16. diff --git a/juick-common/src/main/java/com/juick/server/helpers/PrivateChats.java b/juick-common/src/main/java/com/juick/model/PrivateChats.java index 6e446f98..ad04e649 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/PrivateChats.java +++ b/juick-common/src/main/java/com/juick/model/PrivateChats.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; import com.fasterxml.jackson.annotation.JsonProperty; import com.juick.User; diff --git a/juick-common/src/main/java/com/juick/server/helpers/ResponseReply.java b/juick-common/src/main/java/com/juick/model/ResponseReply.java index 91ba2b8a..acc5db71 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/ResponseReply.java +++ b/juick-common/src/main/java/com/juick/model/ResponseReply.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; import java.util.Date; diff --git a/juick-common/src/main/java/com/juick/server/helpers/TagStats.java b/juick-common/src/main/java/com/juick/model/TagStats.java index ab24983f..da2f3f92 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/TagStats.java +++ b/juick-common/src/main/java/com/juick/model/TagStats.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; import com.fasterxml.jackson.annotation.JsonProperty; import com.juick.Tag; diff --git a/juick-common/src/main/java/com/juick/server/helpers/UserInfo.java b/juick-common/src/main/java/com/juick/model/UserInfo.java index 284cd2e8..ca5d75e0 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/UserInfo.java +++ b/juick-common/src/main/java/com/juick/model/UserInfo.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.server.helpers; +package com.juick.model; /** * Created by vt on 03/09/16. diff --git a/juick-common/src/main/java/com/juick/facebook/User.java b/juick-common/src/main/java/com/juick/model/facebook/User.java index ebd427b4..80838de6 100644 --- a/juick-common/src/main/java/com/juick/facebook/User.java +++ b/juick-common/src/main/java/com/juick/model/facebook/User.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.facebook; +package com.juick.model.facebook; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/juick-common/src/main/java/com/juick/twitter/User.java b/juick-common/src/main/java/com/juick/model/twitter/User.java index 0b4b9c87..3c80eff4 100644 --- a/juick-common/src/main/java/com/juick/twitter/User.java +++ b/juick-common/src/main/java/com/juick/model/twitter/User.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.twitter; +package com.juick.model.twitter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/juick-common/src/main/java/com/juick/vk/Token.java b/juick-common/src/main/java/com/juick/model/vk/Token.java index 979c572c..ed93a3ab 100644 --- a/juick-common/src/main/java/com/juick/vk/Token.java +++ b/juick-common/src/main/java/com/juick/model/vk/Token.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.vk; +package com.juick.model.vk; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/juick-common/src/main/java/com/juick/vk/User.java b/juick-common/src/main/java/com/juick/model/vk/User.java index 00025497..aeb18285 100644 --- a/juick-common/src/main/java/com/juick/vk/User.java +++ b/juick-common/src/main/java/com/juick/model/vk/User.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.vk; +package com.juick.model.vk; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/juick-common/src/main/java/com/juick/vk/UsersResponse.java b/juick-common/src/main/java/com/juick/model/vk/UsersResponse.java index 83092c99..67505703 100644 --- a/juick-common/src/main/java/com/juick/vk/UsersResponse.java +++ b/juick-common/src/main/java/com/juick/model/vk/UsersResponse.java @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package com.juick.vk; +package com.juick.model.vk; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/juick-common/src/main/java/com/juick/service/CrosspostService.java b/juick-common/src/main/java/com/juick/service/CrosspostService.java index 38481d72..99911250 100644 --- a/juick-common/src/main/java/com/juick/service/CrosspostService.java +++ b/juick-common/src/main/java/com/juick/service/CrosspostService.java @@ -18,7 +18,7 @@ package com.juick.service; import com.juick.ExternalToken; -import com.juick.server.helpers.ApplicationStatus; +import com.juick.model.ApplicationStatus; import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nonnull; diff --git a/juick-common/src/main/java/com/juick/service/MessagesService.java b/juick-common/src/main/java/com/juick/service/MessagesService.java index 77ded81e..5a3ff30a 100644 --- a/juick-common/src/main/java/com/juick/service/MessagesService.java +++ b/juick-common/src/main/java/com/juick/service/MessagesService.java @@ -17,10 +17,9 @@ package com.juick.service; -import com.juick.Message; import com.juick.Reaction; import com.juick.User; -import com.juick.server.helpers.ResponseReply; +import com.juick.model.ResponseReply; import java.util.Collection; import java.util.List; diff --git a/juick-common/src/main/java/com/juick/service/SubscriptionService.java b/juick-common/src/main/java/com/juick/service/SubscriptionService.java index d2ff9962..8132ec10 100644 --- a/juick-common/src/main/java/com/juick/service/SubscriptionService.java +++ b/juick-common/src/main/java/com/juick/service/SubscriptionService.java @@ -20,7 +20,7 @@ package com.juick.service; import com.juick.Message; import com.juick.Tag; import com.juick.User; -import com.juick.server.helpers.NotifyOpts; +import com.juick.model.NotifyOpts; import java.util.List; diff --git a/juick-common/src/main/java/com/juick/service/TagService.java b/juick-common/src/main/java/com/juick/service/TagService.java index 7f89b478..489f405a 100644 --- a/juick-common/src/main/java/com/juick/service/TagService.java +++ b/juick-common/src/main/java/com/juick/service/TagService.java @@ -19,7 +19,7 @@ package com.juick.service; import com.juick.Tag; import com.juick.User; -import com.juick.server.helpers.TagStats; +import com.juick.model.TagStats; import org.apache.commons.lang3.tuple.Pair; import java.util.Collection; diff --git a/juick-common/src/main/java/com/juick/service/UserService.java b/juick-common/src/main/java/com/juick/service/UserService.java index 0c3709da..d59f71ef 100644 --- a/juick-common/src/main/java/com/juick/service/UserService.java +++ b/juick-common/src/main/java/com/juick/service/UserService.java @@ -19,8 +19,8 @@ package com.juick.service; import com.juick.Message; import com.juick.User; -import com.juick.server.helpers.Auth; -import com.juick.server.helpers.UserInfo; +import com.juick.model.Auth; +import com.juick.model.UserInfo; import javax.annotation.Nonnull; import java.util.Collection; diff --git a/juick-common/src/main/java/com/juick/server/component/DisconnectedEvent.java b/juick-common/src/main/java/com/juick/service/component/DisconnectedEvent.java index 9da6d7a9..552c3e66 100644 --- a/juick-common/src/main/java/com/juick/server/component/DisconnectedEvent.java +++ b/juick-common/src/main/java/com/juick/service/component/DisconnectedEvent.java @@ -1,4 +1,4 @@ -package com.juick.server.component; +package com.juick.service.component; import org.springframework.context.ApplicationEvent; diff --git a/juick-common/src/main/java/com/juick/server/component/LikeEvent.java b/juick-common/src/main/java/com/juick/service/component/LikeEvent.java index 678a84a9..0d4df70c 100644 --- a/juick-common/src/main/java/com/juick/server/component/LikeEvent.java +++ b/juick-common/src/main/java/com/juick/service/component/LikeEvent.java @@ -1,4 +1,4 @@ -package com.juick.server.component; +package com.juick.service.component; import com.juick.Message; import com.juick.User; diff --git a/juick-common/src/main/java/com/juick/server/component/MessageEvent.java b/juick-common/src/main/java/com/juick/service/component/MessageEvent.java index c0c60228..82911a58 100644 --- a/juick-common/src/main/java/com/juick/server/component/MessageEvent.java +++ b/juick-common/src/main/java/com/juick/service/component/MessageEvent.java @@ -1,4 +1,4 @@ -package com.juick.server.component; +package com.juick.service.component; import com.juick.Message; import com.juick.User; diff --git a/juick-common/src/main/java/com/juick/server/component/MessageReadEvent.java b/juick-common/src/main/java/com/juick/service/component/MessageReadEvent.java index e75d3636..82cfadd5 100644 --- a/juick-common/src/main/java/com/juick/server/component/MessageReadEvent.java +++ b/juick-common/src/main/java/com/juick/service/component/MessageReadEvent.java @@ -1,4 +1,4 @@ -package com.juick.server.component; +package com.juick.service.component; import com.juick.Message; import com.juick.User; diff --git a/juick-common/src/main/java/com/juick/server/component/PingEvent.java b/juick-common/src/main/java/com/juick/service/component/PingEvent.java index abda5b85..8e3f3fa7 100644 --- a/juick-common/src/main/java/com/juick/server/component/PingEvent.java +++ b/juick-common/src/main/java/com/juick/service/component/PingEvent.java @@ -1,4 +1,4 @@ -package com.juick.server.component; +package com.juick.service.component; import com.juick.User; import org.springframework.context.ApplicationEvent; diff --git a/juick-common/src/main/java/com/juick/server/component/SubscribeEvent.java b/juick-common/src/main/java/com/juick/service/component/SubscribeEvent.java index 2d3ceddb..9b644f2f 100644 --- a/juick-common/src/main/java/com/juick/server/component/SubscribeEvent.java +++ b/juick-common/src/main/java/com/juick/service/component/SubscribeEvent.java @@ -1,4 +1,4 @@ -package com.juick.server.component; +package com.juick.service.component; import com.juick.User; import org.springframework.context.ApplicationEvent; diff --git a/juick-common/src/main/java/com/juick/server/component/UserUpdatedEvent.java b/juick-common/src/main/java/com/juick/service/component/UserUpdatedEvent.java index 059aeefd..af2f579a 100644 --- a/juick-common/src/main/java/com/juick/server/component/UserUpdatedEvent.java +++ b/juick-common/src/main/java/com/juick/service/component/UserUpdatedEvent.java @@ -1,4 +1,4 @@ -package com.juick.server.component; +package com.juick.service.component; import com.juick.User; import org.springframework.context.ApplicationEvent; diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle index 10207a7f..b5b7bd89 100644 --- a/juick-notifications/build.gradle +++ b/juick-notifications/build.gradle @@ -1,9 +1,12 @@ apply plugin: 'java' apply plugin: 'org.springframework.boot' -apply plugin: 'io.spring.dependency-management' dependencies { compile project(':juick-common') + compile("org.springframework.boot:spring-boot-starter-websocket") { + exclude module: "spring-boot-starter-tomcat" + exclude module: "spring-boot-starter-web" + } compile 'com.ganyo:gcm-server:1.1.0' compile 'com.turo:pushy:0.13.4' } diff --git a/juick-notifications/src/main/java/com/juick/components/Notifications.java b/juick-notifications/src/main/java/com/juick/components/Notifications.java index 79afe8fa..1842593a 100644 --- a/juick-notifications/src/main/java/com/juick/components/Notifications.java +++ b/juick-notifications/src/main/java/com/juick/components/Notifications.java @@ -22,7 +22,7 @@ import com.google.android.gcm.server.*; import com.juick.ExternalToken; import com.juick.User; import com.juick.formatters.PlainTextFormatter; -import com.juick.server.component.DisconnectedEvent; +import com.juick.service.component.DisconnectedEvent; import com.juick.util.MessageUtils; import com.turo.pushy.apns.ApnsClient; import com.turo.pushy.apns.PushNotificationResponse; diff --git a/juick-notifications/src/main/java/com/juick/components/service/JuickServerReconnectManager.java b/juick-notifications/src/main/java/com/juick/components/service/JuickServerReconnectManager.java index 1f19eec9..b490c154 100644 --- a/juick-notifications/src/main/java/com/juick/components/service/JuickServerReconnectManager.java +++ b/juick-notifications/src/main/java/com/juick/components/service/JuickServerReconnectManager.java @@ -1,6 +1,6 @@ package com.juick.components.service; -import com.juick.server.component.DisconnectedEvent; +import com.juick.service.component.DisconnectedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; diff --git a/juick-server/build.gradle b/juick-server/build.gradle index 722ff09d..9a6196da 100644 --- a/juick-server/build.gradle +++ b/juick-server/build.gradle @@ -65,6 +65,9 @@ dependencies { compile("org.springframework.boot:spring-boot-starter-cache") compile ('org.springframework.boot:spring-boot-starter-security') compile ('org.springframework.boot:spring-boot-starter-jdbc') + compile("org.springframework.boot:spring-boot-starter-security") + compile("org.springframework.boot:spring-boot-starter-web") + compile("org.springframework.boot:spring-boot-starter-websocket") compileOnly 'io.springfox:springfox-core:2.9.2' diff --git a/juick-common/src/main/java/com/juick/server/CommandsManager.java b/juick-server/src/main/java/com/juick/server/CommandsManager.java index 7c4692d2..018cef15 100644 --- a/juick-common/src/main/java/com/juick/server/CommandsManager.java +++ b/juick-server/src/main/java/com/juick/server/CommandsManager.java @@ -21,12 +21,11 @@ import com.juick.Message; import com.juick.Tag; import com.juick.User; import com.juick.formatters.PlainTextFormatter; -import com.juick.server.component.*; -import com.juick.server.helpers.CommandResult; -import com.juick.server.helpers.TagStats; +import com.juick.service.component.*; +import com.juick.model.CommandResult; +import com.juick.model.TagStats; import com.juick.server.helpers.annotation.UserCommand; import com.juick.server.util.HttpUtils; -import com.juick.server.util.TagUtils; import com.juick.service.*; import com.juick.util.MessageUtils; import org.apache.commons.collections4.CollectionUtils; diff --git a/juick-server/src/main/java/com/juick/server/EmailManager.java b/juick-server/src/main/java/com/juick/server/EmailManager.java index 6e8d0d76..d6c2bb3f 100644 --- a/juick-server/src/main/java/com/juick/server/EmailManager.java +++ b/juick-server/src/main/java/com/juick/server/EmailManager.java @@ -2,10 +2,9 @@ package com.juick.server; import com.juick.Message; import com.juick.User; -import com.juick.server.component.MessageEvent; +import com.juick.service.component.MessageEvent; import com.juick.service.EmailService; import com.juick.service.MessagesService; -import com.juick.service.SubscriptionService; import com.juick.service.UserService; import com.juick.util.MessageUtils; import org.apache.commons.lang3.StringUtils; diff --git a/juick-server/src/main/java/com/juick/server/MessengerManager.java b/juick-server/src/main/java/com/juick/server/MessengerManager.java index c58380c5..1283d8b2 100644 --- a/juick-server/src/main/java/com/juick/server/MessengerManager.java +++ b/juick-server/src/main/java/com/juick/server/MessengerManager.java @@ -17,11 +17,10 @@ import com.github.messenger4j.userprofile.UserProfile; import com.github.messenger4j.webhook.event.TextMessageEvent; import com.juick.Message; import com.juick.User; -import com.juick.server.component.MessageEvent; -import com.juick.server.helpers.AnonymousUser; +import com.juick.service.component.MessageEvent; +import com.juick.model.AnonymousUser; import com.juick.service.MessagesService; import com.juick.service.MessengerService; -import com.juick.service.SubscriptionService; import com.juick.service.UserService; import com.juick.util.MessageUtils; import org.apache.commons.lang3.StringUtils; diff --git a/juick-server/src/main/java/com/juick/server/NotificationListener.java b/juick-server/src/main/java/com/juick/server/NotificationListener.java index 47b350c1..750c8b18 100644 --- a/juick-server/src/main/java/com/juick/server/NotificationListener.java +++ b/juick-server/src/main/java/com/juick/server/NotificationListener.java @@ -1,6 +1,6 @@ package com.juick.server; -import com.juick.server.component.*; +import com.juick.service.component.*; import org.springframework.context.event.EventListener; public interface NotificationListener { diff --git a/juick-server/src/main/java/com/juick/server/ServerManager.java b/juick-server/src/main/java/com/juick/server/ServerManager.java index f762b0e7..a50571e6 100644 --- a/juick-server/src/main/java/com/juick/server/ServerManager.java +++ b/juick-server/src/main/java/com/juick/server/ServerManager.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.juick.Message; import com.juick.User; -import com.juick.server.component.*; +import com.juick.service.component.*; import com.juick.service.MessagesService; import com.juick.service.SubscriptionService; import com.juick.service.UserService; diff --git a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java b/juick-server/src/main/java/com/juick/server/TelegramBotManager.java index ac2febf7..3c9bb46a 100644 --- a/juick-server/src/main/java/com/juick/server/TelegramBotManager.java +++ b/juick-server/src/main/java/com/juick/server/TelegramBotManager.java @@ -18,15 +18,14 @@ package com.juick.server; import com.juick.User; -import com.juick.server.component.*; -import com.juick.server.helpers.AnonymousUser; -import com.juick.server.helpers.CommandResult; +import com.juick.service.component.*; +import com.juick.model.AnonymousUser; +import com.juick.model.CommandResult; import com.juick.server.util.HttpUtils; import com.juick.service.MessagesService; import com.juick.service.TelegramService; import com.juick.service.UserService; import com.juick.util.MessageUtils; -import com.pengrad.telegrambot.BotUtils; import com.pengrad.telegrambot.Callback; import com.pengrad.telegrambot.TelegramBot; import com.pengrad.telegrambot.UpdatesListener; @@ -46,7 +45,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; diff --git a/juick-server/src/main/java/com/juick/server/TwitterManager.java b/juick-server/src/main/java/com/juick/server/TwitterManager.java index 9b83b197..eeef2b91 100644 --- a/juick-server/src/main/java/com/juick/server/TwitterManager.java +++ b/juick-server/src/main/java/com/juick/server/TwitterManager.java @@ -17,20 +17,17 @@ package com.juick.server; import com.juick.Message; -import com.juick.server.component.*; +import com.juick.service.component.*; import com.juick.service.CrosspostService; import com.juick.util.MessageUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import twitter4j.TwitterFactory; import twitter4j.conf.ConfigurationBuilder; -import javax.annotation.Nonnull; import javax.inject.Inject; /** diff --git a/juick-server/src/main/java/com/juick/server/WebsocketManager.java b/juick-server/src/main/java/com/juick/server/WebsocketManager.java index 8974a49f..1b62b984 100644 --- a/juick-server/src/main/java/com/juick/server/WebsocketManager.java +++ b/juick-server/src/main/java/com/juick/server/WebsocketManager.java @@ -18,8 +18,8 @@ package com.juick.server; import com.juick.User; -import com.juick.server.helpers.AnonymousUser; -import com.juick.server.helpers.CommandResult; +import com.juick.model.AnonymousUser; +import com.juick.model.CommandResult; import com.juick.server.util.HttpForbiddenException; import com.juick.server.util.HttpNotFoundException; import com.juick.service.MessagesService; @@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java index 692ed3fe..ba155fe7 100644 --- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java +++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java @@ -19,9 +19,9 @@ package com.juick.server; import com.juick.User; import com.juick.formatters.PlainTextFormatter; -import com.juick.server.component.*; -import com.juick.server.helpers.CommandResult; -import com.juick.server.helpers.UserInfo; +import com.juick.service.component.*; +import com.juick.model.CommandResult; +import com.juick.model.UserInfo; import com.juick.server.xmpp.iq.MessageQuery; import com.juick.server.xmpp.s2s.BasicXmppSession; import com.juick.server.xmpp.s2s.StanzaListener; @@ -35,8 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.annotation.DependsOn; -import org.springframework.stereotype.Component; import rocks.xmpp.addr.Jid; import rocks.xmpp.core.XmppException; import rocks.xmpp.core.session.XmppSession; 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; diff --git a/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java index 23a35384..23a35384 100644 --- a/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java +++ b/juick-server/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java diff --git a/juick-common/src/main/java/com/juick/server/configuration/StorageConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/StorageConfiguration.java index 4101f37d..4101f37d 100644 --- a/juick-common/src/main/java/com/juick/server/configuration/StorageConfiguration.java +++ b/juick-server/src/main/java/com/juick/server/configuration/StorageConfiguration.java diff --git a/juick-server/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java index 16d32ee4..f829a999 100644 --- a/juick-server/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java +++ b/juick-server/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java @@ -47,8 +47,6 @@ import java.util.Collections; */ @Configuration @EnableCaching -@Import({ BaseWebConfiguration.class, SecurityConfig.class, SapeConfiguration.class, - StorageConfiguration.class}) public class WwwAppConfiguration implements WebMvcConfigurer { @Inject private UserService userService; diff --git a/juick-common/src/main/java/com/juick/server/helpers/annotation/UserCommand.java b/juick-server/src/main/java/com/juick/server/helpers/annotation/UserCommand.java index 4f07001c..4f07001c 100644 --- a/juick-common/src/main/java/com/juick/server/helpers/annotation/UserCommand.java +++ b/juick-server/src/main/java/com/juick/server/helpers/annotation/UserCommand.java diff --git a/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java b/juick-server/src/main/java/com/juick/server/util/HttpBadRequestException.java index 242f2b09..242f2b09 100644 --- a/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java +++ b/juick-server/src/main/java/com/juick/server/util/HttpBadRequestException.java diff --git a/juick-common/src/main/java/com/juick/server/util/HttpForbiddenException.java b/juick-server/src/main/java/com/juick/server/util/HttpForbiddenException.java index 3251ca38..3251ca38 100644 --- a/juick-common/src/main/java/com/juick/server/util/HttpForbiddenException.java +++ b/juick-server/src/main/java/com/juick/server/util/HttpForbiddenException.java diff --git a/juick-common/src/main/java/com/juick/server/util/HttpNotFoundException.java b/juick-server/src/main/java/com/juick/server/util/HttpNotFoundException.java index f66ece8b..f66ece8b 100644 --- a/juick-common/src/main/java/com/juick/server/util/HttpNotFoundException.java +++ b/juick-server/src/main/java/com/juick/server/util/HttpNotFoundException.java diff --git a/juick-common/src/main/java/com/juick/server/util/HttpUtils.java b/juick-server/src/main/java/com/juick/server/util/HttpUtils.java index 9f356aa5..9f356aa5 100644 --- a/juick-common/src/main/java/com/juick/server/util/HttpUtils.java +++ b/juick-server/src/main/java/com/juick/server/util/HttpUtils.java diff --git a/juick-common/src/main/java/com/juick/server/util/ImageUtils.java b/juick-server/src/main/java/com/juick/server/util/ImageUtils.java index d16faf8f..d16faf8f 100644 --- a/juick-common/src/main/java/com/juick/server/util/ImageUtils.java +++ b/juick-server/src/main/java/com/juick/server/util/ImageUtils.java diff --git a/juick-common/src/main/java/com/juick/server/util/TagUtils.java b/juick-server/src/main/java/com/juick/server/util/TagUtils.java index cb828933..cb828933 100644 --- a/juick-common/src/main/java/com/juick/server/util/TagUtils.java +++ b/juick-server/src/main/java/com/juick/server/util/TagUtils.java diff --git a/juick-common/src/main/java/com/juick/server/util/UserUtils.java b/juick-server/src/main/java/com/juick/server/util/UserUtils.java index ab5c320b..1adc85ab 100644 --- a/juick-common/src/main/java/com/juick/server/util/UserUtils.java +++ b/juick-server/src/main/java/com/juick/server/util/UserUtils.java @@ -18,7 +18,7 @@ package com.juick.server.util; import com.juick.User; -import com.juick.server.helpers.AnonymousUser; +import com.juick.model.AnonymousUser; import com.juick.service.security.entities.JuickUser; import javax.annotation.Nonnull; import org.springframework.security.core.Authentication; diff --git a/juick-common/src/main/java/com/juick/server/util/WebUtils.java b/juick-server/src/main/java/com/juick/server/util/WebUtils.java index 9dd628ee..9dd628ee 100644 --- a/juick-common/src/main/java/com/juick/server/util/WebUtils.java +++ b/juick-server/src/main/java/com/juick/server/util/WebUtils.java diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/NewMessage.java b/juick-server/src/main/java/com/juick/server/www/controllers/NewMessage.java index 9e364ff8..c476e5c2 100644 --- a/juick-server/src/main/java/com/juick/server/www/controllers/NewMessage.java +++ b/juick-server/src/main/java/com/juick/server/www/controllers/NewMessage.java @@ -19,8 +19,8 @@ package com.juick.server.www.controllers; import com.fasterxml.jackson.databind.ObjectMapper; import com.juick.Message; import com.juick.User; -import com.juick.server.helpers.AnonymousUser; -import com.juick.server.helpers.CommandResult; +import com.juick.model.AnonymousUser; +import com.juick.model.CommandResult; import com.juick.server.util.*; import com.juick.server.www.WebApp; import com.juick.service.*; diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/Settings.java b/juick-server/src/main/java/com/juick/server/www/controllers/Settings.java index f2ecccf6..6405b3bd 100644 --- a/juick-server/src/main/java/com/juick/server/www/controllers/Settings.java +++ b/juick-server/src/main/java/com/juick/server/www/controllers/Settings.java @@ -16,8 +16,8 @@ */ package com.juick.server.www.controllers; -import com.juick.server.helpers.NotifyOpts; -import com.juick.server.helpers.UserInfo; +import com.juick.model.NotifyOpts; +import com.juick.model.UserInfo; import com.juick.server.util.*; import com.juick.service.*; import org.apache.commons.lang3.RandomStringUtils; @@ -25,7 +25,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; @@ -45,7 +44,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java b/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java index 93d3946a..3cea3e34 100644 --- a/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java +++ b/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java @@ -24,7 +24,7 @@ import com.github.scribejava.core.builder.ServiceBuilder; import com.github.scribejava.core.model.*; import com.github.scribejava.core.oauth.OAuth10aService; 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.server.util.UserUtils; import com.juick.service.CrosspostService; @@ -32,7 +32,7 @@ import com.juick.service.EmailService; import com.juick.service.TelegramService; import com.juick.service.UserService; import com.juick.server.www.Utils; -import com.juick.vk.UsersResponse; +import com.juick.model.vk.UsersResponse; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.HmacAlgorithms; import org.apache.commons.codec.digest.HmacUtils; @@ -216,8 +216,8 @@ public class SocialLogin { OAuth1AccessToken accessToken = oAuthService.getAccessToken(requestToken, verifier); OAuthRequest oAuthRequest = new OAuthRequest(Verb.GET, TWITTER_VERIFY_URL); oAuthService.signRequest(accessToken, oAuthRequest); - com.juick.twitter.User twitterUser = jsonMapper.readValue(oAuthService.execute(oAuthRequest).getBody(), - com.juick.twitter.User.class); + com.juick.model.twitter.User twitterUser = jsonMapper.readValue(oAuthService.execute(oAuthRequest).getBody(), + com.juick.model.twitter.User.class); if (userService.linkTwitterAccount(user, accessToken.getToken(), accessToken.getTokenSecret(), twitterUser.getScreenName())) { response.setStatus(HttpServletResponse.SC_FOUND); @@ -265,7 +265,7 @@ public class SocialLogin { 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/service/CrosspostServiceImpl.java b/juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java index 14bdc7e2..47d1870b 100644 --- a/juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/CrosspostServiceImpl.java @@ -18,7 +18,7 @@ package com.juick.service; import com.juick.ExternalToken; -import com.juick.server.helpers.ApplicationStatus; +import com.juick.model.ApplicationStatus; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.springframework.dao.EmptyResultDataAccessException; diff --git a/juick-common/src/main/java/com/juick/service/ImagesServiceImpl.java b/juick-server/src/main/java/com/juick/service/ImagesServiceImpl.java index 67c8360e..67c8360e 100644 --- a/juick-common/src/main/java/com/juick/service/ImagesServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/ImagesServiceImpl.java diff --git a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java index 0abe9309..b0707232 100644 --- a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java @@ -18,10 +18,9 @@ package com.juick.service; import com.juick.*; -import com.juick.server.helpers.PrivacyOpts; -import com.juick.server.helpers.ResponseReply; +import com.juick.model.PrivacyOpts; +import com.juick.model.ResponseReply; import com.juick.server.util.HttpNotFoundException; -import com.juick.service.security.entities.JuickUser; import com.juick.util.MessageUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java index 1dee379f..492fef1c 100644 --- a/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/SubscriptionServiceImpl.java @@ -20,7 +20,7 @@ package com.juick.service; import com.juick.Message; import com.juick.Tag; import com.juick.User; -import com.juick.server.helpers.NotifyOpts; +import com.juick.model.NotifyOpts; import org.apache.commons.lang3.StringUtils; import org.springframework.dao.DuplicateKeyException; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; diff --git a/juick-server/src/main/java/com/juick/service/TagServiceImpl.java b/juick-server/src/main/java/com/juick/service/TagServiceImpl.java index aa6c3713..42159d3b 100644 --- a/juick-server/src/main/java/com/juick/service/TagServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/TagServiceImpl.java @@ -19,7 +19,7 @@ package com.juick.service; import com.juick.Tag; import com.juick.User; -import com.juick.server.helpers.TagStats; +import com.juick.model.TagStats; import com.juick.util.StreamUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java index bd72bed9..82e9a124 100644 --- a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java +++ b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java @@ -19,9 +19,9 @@ package com.juick.service; import com.juick.Message; import com.juick.User; -import com.juick.server.helpers.AnonymousUser; -import com.juick.server.helpers.Auth; -import com.juick.server.helpers.UserInfo; +import com.juick.model.AnonymousUser; +import com.juick.model.Auth; +import com.juick.model.UserInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; diff --git a/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java b/juick-server/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java index 9215d09a..9215d09a 100644 --- a/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java +++ b/juick-server/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java diff --git a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java b/juick-server/src/main/java/com/juick/service/security/JuickUserDetailsService.java index 59425fab..59425fab 100644 --- a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java +++ b/juick-server/src/main/java/com/juick/service/security/JuickUserDetailsService.java diff --git a/juick-common/src/main/java/com/juick/service/security/NullUserDetailsService.java b/juick-server/src/main/java/com/juick/service/security/NullUserDetailsService.java index 91acefa3..91acefa3 100644 --- a/juick-common/src/main/java/com/juick/service/security/NullUserDetailsService.java +++ b/juick-server/src/main/java/com/juick/service/security/NullUserDetailsService.java diff --git a/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java b/juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java index e385d7dd..e385d7dd 100644 --- a/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java +++ b/juick-server/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java diff --git a/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java b/juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java index 3631e5a4..3631e5a4 100644 --- a/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java +++ b/juick-server/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java diff --git a/juick-common/src/main/java/com/juick/service/security/entities/JuickUser.java b/juick-server/src/main/java/com/juick/service/security/entities/JuickUser.java index 606a5688..c43f112f 100644 --- a/juick-common/src/main/java/com/juick/service/security/entities/JuickUser.java +++ b/juick-server/src/main/java/com/juick/service/security/entities/JuickUser.java @@ -18,7 +18,7 @@ package com.juick.service.security.entities; import com.juick.User; -import com.juick.server.helpers.AnonymousUser; +import com.juick.model.AnonymousUser; import org.apache.commons.lang3.StringUtils; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java index 924864f6..56434d1e 100644 --- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java +++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java @@ -29,10 +29,10 @@ import com.jayway.jsonpath.JsonPath; import com.juick.*; import com.juick.server.*; import com.juick.server.api.activity.model.ActivityObject; -import com.juick.server.component.MessageEvent; -import com.juick.server.helpers.AnonymousUser; -import com.juick.server.helpers.CommandResult; -import com.juick.server.helpers.TagStats; +import com.juick.service.component.MessageEvent; +import com.juick.model.AnonymousUser; +import com.juick.model.CommandResult; +import com.juick.model.TagStats; import com.juick.server.util.HttpUtils; import com.juick.server.util.ImageUtils; import com.juick.server.www.Utils; |