Extract sape code into ControllerAdvice

5 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/com/juick/server/api/Messages.java b/src/main/java/com/juick/server/api/Messages.java
index ffe55d3f..5e0743dd 100644
--- a/src/main/java/com/juick/server/api/Messages.java
+++ b/src/main/java/com/juick/server/api/Messages.java
@@ -21,7 +21,7 @@ import com.juick.model.Message;
 import com.juick.model.Tag;
 import com.juick.model.User;
 import com.juick.server.Utils;
-import com.juick.server.www.WebApp;
+import com.juick.www.WebApp;
 import com.juick.model.CommandResult;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.service.MessagesService;
diff --git a/src/main/java/com/juick/server/api/PM.java b/src/main/java/com/juick/server/api/PM.java
index d5860057..a37cc85e 100644
--- a/src/main/java/com/juick/server/api/PM.java
+++ b/src/main/java/com/juick/server/api/PM.java
@@ -25,7 +25,7 @@ import com.juick.model.PrivateChats;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.server.util.HttpForbiddenException;
 import com.juick.server.util.WebUtils;
-import com.juick.server.www.WebApp;
+import com.juick.www.WebApp;
 import com.juick.service.PMQueriesService;
 import com.juick.service.UserService;
 import com.juick.service.component.SystemEvent;
diff --git a/src/main/java/com/juick/server/api/Users.java b/src/main/java/com/juick/server/api/Users.java
index 531883fc..84ac5174 100644
--- a/src/main/java/com/juick/server/api/Users.java
+++ b/src/main/java/com/juick/server/api/Users.java
@@ -20,12 +20,11 @@ package com.juick.server.api;
 import com.juick.model.User;
 import com.juick.model.AnonymousUser;
 import com.juick.model.ApplicationStatus;
-import com.juick.server.EmailManager;
 import com.juick.server.util.HttpBadRequestException;
 import com.juick.server.util.HttpNotFoundException;
 import com.juick.server.util.HttpUtils;
 import com.juick.server.util.WebUtils;
-import com.juick.server.www.WebApp;
+import com.juick.www.WebApp;
 import com.juick.service.*;
 import com.juick.service.component.MailVerificationEvent;
 import com.juick.service.security.annotation.Visitor;
diff --git a/src/main/java/com/juick/server/api/activity/Profile.java b/src/main/java/com/juick/server/api/activity/Profile.java
index f17b70c6..bbe3c0af 100644
--- a/src/main/java/com/juick/server/api/activity/Profile.java
+++ b/src/main/java/com/juick/server/api/activity/Profile.java
@@ -41,7 +41,7 @@ import com.juick.server.api.activity.model.objects.OrderedCollection;
 import com.juick.server.api.activity.model.objects.OrderedCollectionPage;
 import com.juick.server.api.activity.model.objects.Person;
 import com.juick.server.util.HttpNotFoundException;
-import com.juick.server.www.WebApp;
+import com.juick.www.WebApp;
 import com.juick.service.MessagesService;
 import com.juick.service.UserService;
 import com.juick.service.activities.AnnounceEvent;
diff --git a/src/main/java/com/juick/server/api/rss/MessagesView.java b/src/main/java/com/juick/server/api/rss/MessagesView.java
index e7bc1bb3..a03dd723 100644
--- a/src/main/java/com/juick/server/api/rss/MessagesView.java
+++ b/src/main/java/com/juick/server/api/rss/MessagesView.java
@@ -21,7 +21,7 @@ import com.juick.model.Message;
 import com.juick.model.User;
 import com.juick.server.api.rss.extension.JuickModule;
 import com.juick.server.api.rss.extension.JuickModuleImpl;
-import com.juick.server.www.WebApp;
+import com.juick.www.WebApp;
 import com.juick.util.MessageUtils;
 import com.rometools.modules.atom.modules.AtomLinkModule;
 import com.rometools.modules.atom.modules.AtomLinkModuleImpl;