diff options
author | 2018-02-18 00:35:39 +0300 | |
---|---|---|
committer | 2018-02-18 00:40:47 +0300 | |
commit | b8a19617ef2c257e1233ad215836b788fa019afb (patch) | |
tree | 896acde9babd45d4743d1dde9ca3bff6a70d94ad /juick-server/src/main/java/com/juick/server/configuration | |
parent | 3e0d8bc42c4972d3ab66c5b4292e022c5e62034e (diff) |
server: cleanup layout
Diffstat (limited to 'juick-server/src/main/java/com/juick/server/configuration')
-rw-r--r-- | juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java | 5 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/configuration/JsonpAdvice.java | 31 |
2 files changed, 33 insertions, 3 deletions
diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java index 21c1238b..55050f7e 100644 --- a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java +++ b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java @@ -17,13 +17,12 @@ package com.juick.server.configuration; -import com.juick.server.ServerManager; import com.juick.server.WebsocketManager; import com.juick.server.component.JuickServerComponent; import com.juick.server.component.JuickServerReconnectManager; import com.juick.service.UserService; -import com.juick.xmpp.helpers.JidConverter; -import com.juick.xmpp.s2s.BasicXmppSession; +import com.juick.server.xmpp.helpers.JidConverter; +import com.juick.server.xmpp.s2s.BasicXmppSession; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.*; import org.springframework.core.convert.ConversionService; diff --git a/juick-server/src/main/java/com/juick/server/configuration/JsonpAdvice.java b/juick-server/src/main/java/com/juick/server/configuration/JsonpAdvice.java new file mode 100644 index 00000000..5cee2974 --- /dev/null +++ b/juick-server/src/main/java/com/juick/server/configuration/JsonpAdvice.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2008-2017, Juick + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package com.juick.server.configuration; + +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.servlet.mvc.method.annotation.AbstractJsonpResponseBodyAdvice; + +/** + * Created by vitalyster on 25.11.2016. + */ +@ControllerAdvice +public class JsonpAdvice extends AbstractJsonpResponseBodyAdvice { + public JsonpAdvice() { + super("callback"); + } +} |