merge common projects

32 files changed, 0 insertions, 2104 deletions

diff --git a/juick-server-web/src/main/java/com/juick/server/component/DisconnectedEvent.java b/juick-server-web/src/main/java/com/juick/server/component/DisconnectedEvent.java
deleted file mode 100644
index 9da6d7a9..00000000
--- a/juick-server-web/src/main/java/com/juick/server/component/DisconnectedEvent.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.juick.server.component;
-
-import org.springframework.context.ApplicationEvent;
-
-public class DisconnectedEvent extends ApplicationEvent {
-    /**
-     * Create a new ApplicationEvent.
-     *
-     * @param source the object on which the event initially occurred (never {@code null})
-     */
-    public DisconnectedEvent(Object source) {
-        super(source);
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/component/JuickServerComponent.java b/juick-server-web/src/main/java/com/juick/server/component/JuickServerComponent.java
deleted file mode 100644
index 792f446f..00000000
--- a/juick-server-web/src/main/java/com/juick/server/component/JuickServerComponent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.juick.server.component;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.web.socket.CloseStatus;
-import org.springframework.web.socket.PingMessage;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.handler.TextWebSocketHandler;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class JuickServerComponent extends TextWebSocketHandler {
-    private static Logger logger = LoggerFactory.getLogger(JuickServerComponent.class);
-    @Inject
-    private ApplicationEventPublisher applicationEventPublisher;
-    @Inject
-    private ObjectMapper jsonMapper;
-
-    private WebSocketSession session;
-    private final AtomicBoolean closeFlag = new AtomicBoolean(false);
-
-    @PostConstruct
-    public void init() {
-        closeFlag.set(false);
-    }
-    @Override
-    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
-        logger.info("WebSocket connected");
-        this.session = session;
-    }
-
-    @Override
-    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
-        logger.info("WebSocket disconnected with code {}: {}", status.getCode(), status.getReason());
-        applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
-    }
-
-    @Override
-    protected void handleTextMessage(WebSocketSession session, TextMessage text) throws Exception {
-        com.juick.Message jmsg = jsonMapper.readValue(text.asBytes(), com.juick.Message.class);
-
-        if (logger.isInfoEnabled()) // prevent writeValueAsString execution if logger disabled
-            logger.info("got jmsg: {}", jsonMapper.writeValueAsString(jmsg));
-        if (!closeFlag.get()) {
-            applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
-        }
-    }
-
-    @Scheduled(fixedRate = 30000, initialDelay = 30000)
-    public void ping() throws IOException {
-        if (session != null && session.isOpen()) {
-            logger.debug("Sending WebSocket ping");
-            session.sendMessage(new PingMessage());
-        } else if (!closeFlag.get()) {
-            applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
-        }
-    }
-    @PreDestroy
-    public void close() {
-        closeFlag.set(true);
-    }
-
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/component/JuickServerReconnectManager.java b/juick-server-web/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
deleted file mode 100644
index a662e4fb..00000000
--- a/juick-server-web/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.juick.server.component;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-import org.springframework.web.socket.client.WebSocketConnectionManager;
-
-import javax.inject.Inject;
-
-@Component
-public class JuickServerReconnectManager implements ApplicationListener<DisconnectedEvent> {
-    private static Logger logger = LoggerFactory.getLogger(JuickServerReconnectManager.class);
-    @Inject
-    private WebSocketConnectionManager webSocketConnectionManager;
-    @Override
-    public void onApplicationEvent(DisconnectedEvent event) {
-        logger.info("retrying...");
-        webSocketConnectionManager.stop();
-        webSocketConnectionManager.start();
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/component/MessageEvent.java b/juick-server-web/src/main/java/com/juick/server/component/MessageEvent.java
deleted file mode 100644
index 048de6a6..00000000
--- a/juick-server-web/src/main/java/com/juick/server/component/MessageEvent.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.juick.server.component;
-
-import com.juick.Message;
-import org.springframework.context.ApplicationEvent;
-
-public class MessageEvent extends ApplicationEvent {
-    private Message message;
-    /**
-     * Create a new ApplicationEvent.
-     *
-     * @param source the object on which the event initially occurred (never {@code null})
-     * @param message app message
-     */
-    public MessageEvent(Object source, Message message) {
-        super(source);
-        this.message = message;
-    }
-
-    public Message getMessage() {
-        return message;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/component/UserUpdatedEvent.java b/juick-server-web/src/main/java/com/juick/server/component/UserUpdatedEvent.java
deleted file mode 100644
index 059aeefd..00000000
--- a/juick-server-web/src/main/java/com/juick/server/component/UserUpdatedEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.juick.server.component;
-
-import com.juick.User;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.lang.NonNull;
-
-public class UserUpdatedEvent extends ApplicationEvent {
-    private User user;
-    /**
-     * Generated when user is updated (avatar changed, etc).
-     *
-     * @param source the object on which the event initially occurred (never {@code null})
-     * @param user updated user
-     */
-    public UserUpdatedEvent(@NonNull Object source, User user) {
-        super(source);
-        this.user = user;
-    }
-
-    public User getUser() {
-        return user;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
deleted file mode 100644
index d9b842af..00000000
--- a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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 com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.juick.server.xmpp.JidConverter;
-import com.juick.server.xmpp.s2s.BasicXmppSession;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import rocks.xmpp.core.session.Extension;
-import rocks.xmpp.core.session.XmppSessionConfiguration;
-import rocks.xmpp.core.session.debug.LogbackDebugger;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * Created by vitalyster on 28.06.2016.
- */
-@Configuration
-public class BaseWebConfiguration implements WebMvcConfigurer, SchedulingConfigurer {
-
-
-    @Override
-    public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurer.setUseSuffixPatternMatch(false);
-    }
-
-    @Override
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(jsonMapper());
-        converters.add(converter);
-    }
-
-    @Bean
-    public ObjectMapper jsonMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
-        mapper.registerModule(new Jdk8Module());
-        mapper.registerModule(new JavaTimeModule());
-        return mapper;
-    }
-
-    @Bean
-    public MultipartResolver multipartResolver() {
-        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-        resolver.setMaxUploadSize(10000000);
-        return resolver;
-    }
-
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.setScheduler(taskExecutor());
-    }
-
-    @Bean(destroyMethod="shutdown")
-    public Executor taskExecutor() {
-        return Executors.newScheduledThreadPool(100);
-    }
-    @Value("${hostname:localhost}")
-    private String hostname;
-
-    @Bean
-    public ExecutorService service() {
-        return Executors.newCachedThreadPool();
-    }
-    @Bean
-    public BasicXmppSession session() {
-        XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
-                .extensions(Extension.of(com.juick.Message.class))
-                .debugger(LogbackDebugger.class)
-                .build();
-        return BasicXmppSession.create(hostname, configuration);
-    }
-    @Bean
-    public static ConversionService conversionService() {
-        DefaultFormattingConversionService cs = new DefaultFormattingConversionService();
-        cs.addConverter(new JidConverter());
-        return cs;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java b/juick-server-web/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java
deleted file mode 100644
index 18501eaf..00000000
--- a/juick-server-web/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.juick.server.configuration;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.juick.server.component.JuickServerComponent;
-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.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.InterceptingClientHttpRequestFactory;
-import org.springframework.http.client.support.BasicAuthorizationInterceptor;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.socket.client.WebSocketConnectionManager;
-import org.springframework.web.socket.client.standard.StandardWebSocketClient;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-@Lazy
-@Configuration
-@EnableScheduling
-public class JuickServerWebsocketConfiguration {
-    private static final Logger logger = LoggerFactory.getLogger(JuickServerWebsocketConfiguration.class);
-    @Value("${websocket_url:ws://localhost:8080/ws/}")
-    private String baseUri;
-    @Value("${api_user:juick}")
-    private String serviceUser;
-    @Value("${api_password:secret}")
-    private String servicePassword;
-    @Inject
-    ObjectMapper jsonMapper;
-    @Inject
-    private JuickServerComponent juickServerComponent;
-    @Bean
-    public RestTemplate rest() {
-        RestTemplate rest = new RestTemplate();
-        List<ClientHttpRequestInterceptor> interceptors = Collections.singletonList(
-                new BasicAuthorizationInterceptor(serviceUser, servicePassword));
-
-        rest.setRequestFactory(new InterceptingClientHttpRequestFactory(rest.getRequestFactory(), interceptors));
-        return rest;
-    }
-    @Bean
-    public WebSocketConnectionManager connectionManager() {
-        String hash = StringUtils.EMPTY;
-        try {
-            ResponseEntity<String> response = rest().exchange("https://api.juick.com/auth",
-                    HttpMethod.GET, null, String.class);
-            hash = jsonMapper.readValue(response.getBody(), String.class);
-        } catch (HttpClientErrorException | IOException e) {
-            logger.warn("service component is not authenticated", e);
-        }
-        String websocketURI = UriComponentsBuilder.fromUriString(baseUri)
-                .queryParam("hash", hash).build().toUriString();
-        WebSocketConnectionManager manager = new WebSocketConnectionManager(client(), juickServerComponent, websocketURI);
-        return manager;
-    }
-    @Bean
-    public StandardWebSocketClient client() {
-        return new StandardWebSocketClient();
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java b/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java
deleted file mode 100644
index 94b23037..00000000
--- a/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.juick.server.configuration;
-
-import com.juick.service.ImagesService;
-import com.juick.service.ImagesServiceImpl;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class StorageConfiguration {
-    @Bean
-    public ImagesService imagesService() {
-        return new ImagesServiceImpl();
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-server-web/src/main/java/com/juick/server/protocol/JuickProtocol.java
deleted file mode 100644
index 1be34a3f..00000000
--- a/juick-server-web/src/main/java/com/juick/server/protocol/JuickProtocol.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 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.protocol;
-
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.formatters.PlainTextFormatter;
-import com.juick.server.protocol.annotation.UserCommand;
-import com.juick.server.util.TagUtils;
-import com.juick.service.*;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.lang3.reflect.MethodUtils;
-
-import javax.inject.Inject;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Created by oxpa on 22.03.16.
- */
-
-public class JuickProtocol {
-
-    private String baseUri;
-    private ProtocolListener listener;
-
-    @Inject
-    UserService userService;
-    @Inject
-    TagService tagService;
-    @Inject
-    MessagesService messagesService;
-    @Inject
-    SubscriptionService subscriptionService;
-    @Inject
-    PMQueriesService pmQueriesService;
-    @Inject
-    PrivacyQueriesService privacyQueriesService;
-    @Inject
-    ShowQueriesService showQueriesService;
-
-    public JuickProtocol(String baseUri) {
-        this.baseUri = baseUri;
-    }
-
-    /**
-     * find command by pattern and invoke
-     * @param user who send command
-     * @param userInput given by user
-     * @return command result
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     * @throws NoSuchMethodException
-     */
-    public String getReply(User user, String userInput) throws InvocationTargetException,
-            IllegalAccessException, NoSuchMethodException {
-        Optional<Method> cmd = MethodUtils.getMethodsListWithAnnotation(getClass(), UserCommand.class).stream()
-                .filter(m -> Pattern.compile(m.getAnnotation(UserCommand.class).pattern(),
-                        m.getAnnotation(UserCommand.class).patternFlags()).matcher(userInput).matches())
-                .findFirst();
-        if (!cmd.isPresent()) {
-            // default command - post as new message
-            return postMessage(user, userInput.trim());
-        } else {
-            Matcher matcher = Pattern.compile(cmd.get().getAnnotation(UserCommand.class).pattern(),
-                    cmd.get().getAnnotation(UserCommand.class).patternFlags()).matcher(userInput.trim());
-            List<String> groups = new ArrayList<>();
-            while (matcher.find()) {
-                for (int i = 1; i <= matcher.groupCount(); i++) {
-                    groups.add(matcher.group(i));
-                }
-            }
-            return (String) getClass().getMethod(cmd.get().getName(), User.class, String[].class)
-                    .invoke(this, user, groups.toArray(new String[groups.size()]));
-        }
-    }
-
-    public String postMessage(User user, String input) {
-        List<Tag> tags = tagService.fromString(input, false);
-        String body = input.substring(TagUtils.toString(tags).length());
-        int mid = messagesService.createMessage(user.getUid(), body, null, tags);
-        subscriptionService.subscribeMessage(mid, user.getUid());
-        listener.messagePosted(messagesService.getMessage(mid));
-        return "New message posted.\n#" + mid + " " + baseUri + mid;
-    }
-
-
-
-
-    @UserCommand(pattern = "^d\\s*\\#([0-9]+)$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "D #12345 - delete the message")
-    public String commandDel(User user, String... args) {
-        int mid = NumberUtils.toInt(args[0], 0);
-        if (messagesService.deleteMessage(user.getUid(), mid)) {
-            return String.format("Message %s deleted", mid);
-        }
-        return "Error";
-    }
-
-
-    @UserCommand(pattern = "^(#+)$", help = "# - Show last messages from your feed (## - second page, ...)")
-    public String commandMyFeed(User user, String... arguments) {
-        // number of # is the page count
-        int page = arguments[0].length() - 1;
-        List<Integer> mids = messagesService.getMyFeed(user.getUid(), page, false);
-        List<Message> messages = messagesService.getMessages(mids);
-        // TODO: add instructions for empty feed
-        return "Your feed: \n" + String.join("\n",
-                messages.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList()));
-    }
-    @UserCommand(pattern = "^(#|\\.)(\\d+)((\\.|\\-|\\/)(\\d+))?\\s([\\s\\S]+)",
-    help = "#1234 *tag *tag2 - edit tags\n#1234 text - reply to message")
-    public String EditOrReply(User user, String... args) {
-        int mid = NumberUtils.toInt(args[1]);
-        int rid = NumberUtils.toInt(args[4], 0);
-        String txt = args[5];
-        List<Tag> messageTags = tagService.fromString(txt, true);
-        if (messageTags.size() > 0) {
-            if (user.getUid() != messagesService.getMessageAuthor(mid).getUid()) {
-                return "It is not your message";
-            }
-            tagService.updateTags(mid, messageTags);
-            return "Tags are updated";
-        } else {
-            int newrid = messagesService.createReply(mid, rid, user.getUid(), txt, null);
-            listener.messagePosted(messagesService.getReply(mid, newrid));
-            return "Reply posted.\n#" + mid + "/" + newrid + " "
-                    + baseUri + mid + "#" + newrid;
-        }
-    }
-
-
-    @UserCommand(pattern = "^(s|u)\\s+\\@(\\S+)$", help = "S @user - subscribe to user's posts",
-            patternFlags = Pattern.CASE_INSENSITIVE)
-    public String commandSubscribeUser(User user, String... args) {
-        boolean subscribe = args[0].equalsIgnoreCase("s");
-        User toUser = userService.getUserByName(args[1]);
-        if (toUser.getUid() > 0) {
-            if (subscribe) {
-                if (subscriptionService.subscribeUser(user, toUser)) {
-                    listener.userSubscribed(user, toUser);
-                    return "Subscribed";
-                    // TODO: already subscribed case
-                }
-            } else {
-                if (subscriptionService.unSubscribeUser(user, toUser)) {
-                    return "Unsubscribed from @" + toUser.getName();
-                }
-                return "You was not subscribed to @" + toUser.getName();
-            }
-        }
-        return "Error";
-    }
-
-    public String getBaseUri() {
-        return baseUri;
-    }
-
-    public ProtocolListener getListener() {
-        return listener;
-    }
-
-    public void setListener(ProtocolListener listener) {
-        this.listener = listener;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/protocol/ProtocolListener.java b/juick-server-web/src/main/java/com/juick/server/protocol/ProtocolListener.java
deleted file mode 100644
index f051e6d0..00000000
--- a/juick-server-web/src/main/java/com/juick/server/protocol/ProtocolListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.protocol;
-
-import com.juick.Message;
-import com.juick.User;
-
-/**
- * Created by vitalyster on 19.12.2016.
- */
-public interface ProtocolListener {
-    void privateMessage(User from, User to, String body);
-    void userSubscribed(User from, User to);
-    void messagePosted(Message msg);
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/juick-server-web/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
deleted file mode 100644
index ab37a4e1..00000000
--- a/juick-server-web/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.protocol.annotation;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Created by oxpa on 22.03.16.
- */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface UserCommand {
-    /**
-     *
-     * @return a command pattern
-     */
-    String pattern() default StringUtils.EMPTY;
-
-    /**
-     *
-     * @return pattern flags
-     */
-    int patternFlags() default 0;
-
-    /**
-     *
-     * @return a string used in HELP command output. Basically, only 1 string
-     */
-    String help() default StringUtils.EMPTY;
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpBadRequestException.java b/juick-server-web/src/main/java/com/juick/server/util/HttpBadRequestException.java
deleted file mode 100644
index 1c3b4e66..00000000
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpBadRequestException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.util;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Created by vt on 24/11/2016.
- */
-@ResponseStatus(value = HttpStatus.BAD_REQUEST)
-public class HttpBadRequestException extends RuntimeException {
-    public HttpBadRequestException() {
-        super(StringUtils.EMPTY, null, false, false);
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpForbiddenException.java b/juick-server-web/src/main/java/com/juick/server/util/HttpForbiddenException.java
deleted file mode 100644
index 3251ca38..00000000
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpForbiddenException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.util;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Created by vt on 24/11/2016.
- */
-@ResponseStatus(value = HttpStatus.FORBIDDEN)
-public class HttpForbiddenException extends RuntimeException {
-    public HttpForbiddenException() {
-        super(StringUtils.EMPTY, null, false, false);
-    }
-
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpNotFoundException.java b/juick-server-web/src/main/java/com/juick/server/util/HttpNotFoundException.java
deleted file mode 100644
index f66ece8b..00000000
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpNotFoundException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.util;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Created by vt on 24/11/2016.
- */
-@ResponseStatus(value = HttpStatus.NOT_FOUND)
-public class HttpNotFoundException extends RuntimeException {
-    public HttpNotFoundException() {
-        super(StringUtils.EMPTY, null, false, false);
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpUtils.java b/juick-server-web/src/main/java/com/juick/server/util/HttpUtils.java
deleted file mode 100644
index 35f594f3..00000000
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpUtils.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.util;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.UUID;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class HttpUtils {
-    private static final Logger logger = LoggerFactory.getLogger(HttpUtils.class);
-
-    public static String receiveMultiPartFile(MultipartFile attach, String tmpDir) {
-        if (attach !=null && !attach.isEmpty()) {
-            String partname = attach.getOriginalFilename();
-            if (partname != null && partname.length() > 0) {
-                String attachmentType = partname.substring(partname.length() - 3).toLowerCase();
-                if (attachmentType.equals("jpg") || attachmentType.equals("peg") || attachmentType.equals("png")) {
-                    if (attachmentType.equals("peg")) {
-                        attachmentType = "jpg";
-                    }
-                    String attachmentFName = DigestUtils.md5Hex(UUID.randomUUID().toString()) + "." + attachmentType;
-                    try {
-                        Files.write(Paths.get(tmpDir, attachmentFName),
-                                attach.getBytes());
-                        return attachmentFName;
-                    } catch (IOException e) {
-                        logger.warn("file receive error", e);
-                    }
-                }
-            }
-        }
-        return StringUtils.EMPTY;
-    }
-    public static String downloadImage(URL url, String tmpDir) throws Exception {
-        URLConnection urlConn;
-        try {
-            urlConn = url.openConnection();
-        } catch (IOException e) {
-            logger.error(String.format("Failed open url: %s", url.toString()));
-            throw e;
-        }
-
-        try (InputStream is = urlConn.getInputStream()) {
-            String mime = urlConn.getContentType();
-
-            String attachmentType;
-            if (mime != null && mime.equals("image/jpeg")) {
-                attachmentType = "jpg";
-            } else if (mime != null && mime.equals("image/png")) {
-                attachmentType = "png";
-            } else if (url.getFile().toLowerCase().endsWith("jpg")) {
-                attachmentType = "jpg";
-            } else if (url.getFile().toLowerCase().endsWith("png")) {
-                attachmentType = "png";
-            } else {
-                throw new Exception("Wrong file type: " + mime);
-            }
-
-            String attachmentFName = DigestUtils.md5Hex(UUID.randomUUID().toString()) + "." + attachmentType;
-            Files.copy(is, Paths.get(tmpDir, attachmentFName));
-            return attachmentFName;
-        } catch (Exception e) {
-            logger.error(String.format("Failed download image by url: %s", url.toString()), e);
-            throw e;
-        }
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/util/ImageUtils.java b/juick-server-web/src/main/java/com/juick/server/util/ImageUtils.java
deleted file mode 100644
index 94ecf71e..00000000
--- a/juick-server-web/src/main/java/com/juick/server/util/ImageUtils.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-/*
- * 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.util;
-
-import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.ImageMetadata;
-import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-import org.apache.commons.imaging.formats.tiff.TiffField;
-import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
-import org.apache.commons.io.FilenameUtils;
-import org.imgscalr.Scalr;
-import org.imgscalr.Scalr.Rotation;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-
-public class ImageUtils {
-
-/**
- * Returns <code>BufferedImage</code>, same as <code>ImageIO.read()</code> does.
- *
- * <p>JPEG images with EXIF metadata are rotated according to Orientation tag.
- *
- * @param imageFile a <code>File</code> to read from.
- */
-    private static BufferedImage readImageWithOrientation(File imageFile)
-            throws IOException {
-
-        BufferedImage image = ImageIO.read(imageFile);
-        if (!FilenameUtils.getExtension(imageFile.getName()).equals("jpg")) {
-            return image;
-        }
-
-        try {
-            ImageMetadata metadata = Imaging.getMetadata(imageFile);
-
-            if (metadata instanceof JpegImageMetadata) {
-                JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
-                TiffField orientationField = jpegMetadata.findEXIFValue(TiffTagConstants.TIFF_TAG_ORIENTATION);
-
-                if (orientationField != null) {
-                    int orientation = orientationField.getIntValue();
-                    switch (orientation) {
-                        case TiffTagConstants.ORIENTATION_VALUE_ROTATE_90_CW:
-                            image = Scalr.rotate(image, Rotation.CW_90);
-                            break;
-                        case TiffTagConstants.ORIENTATION_VALUE_ROTATE_180:
-                            image = Scalr.rotate(image, Rotation.CW_180);
-                            break;
-                        case TiffTagConstants.ORIENTATION_VALUE_ROTATE_270_CW:
-                            image = Scalr.rotate(image, Rotation.CW_270);
-                            break;
-                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_HORIZONTAL:
-                            image = Scalr.rotate(image, Rotation.FLIP_HORZ);
-                            break;
-                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_VERTICAL:
-                            image = Scalr.rotate(image, Rotation.FLIP_VERT);
-                            break;
-                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW:
-                            image = Scalr.rotate(Scalr.rotate(image, Rotation.FLIP_HORZ), Rotation.CW_90);
-                            break;
-                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW:
-                            image = Scalr.rotate(Scalr.rotate(image, Rotation.FLIP_HORZ), Rotation.CW_270);
-                            break;
-                        case TiffTagConstants.ORIENTATION_VALUE_HORIZONTAL_NORMAL:
-                        default:
-                            // do nothing
-                            break;
-                    }
-                }
-            }
-        } catch (ImageReadException e) {
-            // failed to read metadata.
-            // nothing to do here, return image as is.
-        }
-
-        return image;
-    }
-
-    /**
-     * Move attached image from temp folder to image folder.
-     * Create preview images in corresponding folders.
-     *
-     * @param tempFilename   Name of the image file in the temp folder.
-     * @param outputFilename Name that will be used in the image folder.
-     * @param tmpDir         Path string for the temp folder.
-     * @param imgDir         Path string for the image folder.
-     */
-    public static void saveImageWithPreviews(String tempFilename, String outputFilename, String tmpDir, String imgDir)
-            throws IOException {
-        String ext = FilenameUtils.getExtension(outputFilename);
-
-        Path outputImagePath = Paths.get(imgDir, "p", outputFilename);
-        Files.move(Paths.get(tmpDir, tempFilename), outputImagePath);
-        BufferedImage originalImage = readImageWithOrientation(outputImagePath.toFile());
-
-        int width = originalImage.getWidth();
-        int height = originalImage.getHeight();
-        int maxDimension = (width > height) ? width : height;
-        BufferedImage image1024 = (maxDimension > 1024) ? Scalr.resize(originalImage, 1024) : originalImage;
-        BufferedImage image0512 = (maxDimension > 512) ? Scalr.resize(originalImage, 512) : originalImage;
-        BufferedImage image0160 = (maxDimension > 160) ? Scalr.resize(originalImage, 160) : originalImage;
-        ImageIO.write(image1024, ext, Paths.get(imgDir, "photos-1024", outputFilename).toFile());
-        ImageIO.write(image0512, ext, Paths.get(imgDir, "photos-512", outputFilename).toFile());
-        ImageIO.write(image0160, ext, Paths.get(imgDir, "ps", outputFilename).toFile());
-    }
-
-    /**
-     * Save new avatar in all required sizes.
-     *
-     * @param tempFilename Name of the image file in the temp folder.
-     * @param uid          User id that is used to build image file names.
-     * @param tmpDir       Path string for the temp folder.
-     * @param imgDir       Path string for the image folder.
-     */
-    public static void saveAvatar(String tempFilename, int uid, String tmpDir, String imgDir)
-            throws IOException {
-        String ext = FilenameUtils.getExtension(tempFilename);
-        String originalName = String.format("%s.%s", uid, ext);
-        Path originalPath = Paths.get(imgDir, "ao", originalName);
-        Files.move(Paths.get(tmpDir, tempFilename), originalPath, StandardCopyOption.REPLACE_EXISTING);
-        BufferedImage originalImage = ImageIO.read(originalPath.toFile());
-
-        String targetExt = "png";
-        String targetName = String.format("%s.%s", uid, targetExt);
-        ImageIO.write(Scalr.resize(originalImage, 96), targetExt, Paths.get(imgDir, "a", targetName).toFile());
-        ImageIO.write(Scalr.resize(originalImage, 32), targetExt, Paths.get(imgDir, "as", targetName).toFile());
-    }
-
-    public static Integer getImageHeight(File imageFile) throws IOException, ImageReadException {
-        if (imageFile.exists()) {
-            ImageInfo info = Imaging.getImageInfo(imageFile);
-            return info.getHeight();
-        }
-        return 0;
-    }
-    public static Integer getImageWidth(File imageFile) throws IOException, ImageReadException {
-        if (imageFile.exists()) {
-            ImageInfo info = Imaging.getImageInfo(imageFile);
-            return info.getWidth();
-        }
-        return 0;
-    }
-}
\ No newline at end of file
diff --git a/juick-server-web/src/main/java/com/juick/server/util/UserUtils.java b/juick-server-web/src/main/java/com/juick/server/util/UserUtils.java
deleted file mode 100644
index ab5c320b..00000000
--- a/juick-server-web/src/main/java/com/juick/server/util/UserUtils.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.util;
-
-import com.juick.User;
-import com.juick.server.helpers.AnonymousUser;
-import com.juick.service.security.entities.JuickUser;
-import javax.annotation.Nonnull;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * Created by aalexeev on 11/14/16.
- */
-public class UserUtils {
-    private UserUtils() {
-        throw new IllegalStateException();
-    }
-
-    public static Authentication getAuthentication() {
-        return SecurityContextHolder.getContext().getAuthentication();
-    }
-
-    public static Object getPrincipal(final Authentication authentication) {
-        return authentication == null ? null : authentication.getPrincipal();
-    }
-
-    @Nonnull
-    public static User getCurrentUser() {
-        Object principal = getPrincipal(getAuthentication());
-
-        if (principal instanceof JuickUser)
-            return ((JuickUser) principal).getUser();
-
-        if (principal instanceof User)
-            return (User) principal;
-
-        return AnonymousUser.INSTANCE;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/util/WebUtils.java b/juick-server-web/src/main/java/com/juick/server/util/WebUtils.java
deleted file mode 100644
index 9dd628ee..00000000
--- a/juick-server-web/src/main/java/com/juick/server/util/WebUtils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.util;
-
-import java.util.regex.Pattern;
-
-/**
- * Created by aalexeev on 11/28/16.
- */
-public class WebUtils {
-    private WebUtils() {
-        throw new IllegalStateException();
-    }
-
-    private static final Pattern USER_NAME_PATTERN = Pattern.compile("[a-zA-Z-_\\d]{2,16}");
-
-    private static final Pattern POST_NUMBER_PATTERN = Pattern.compile("-?\\d+");
-
-    private static final Pattern JID_PATTERN = Pattern.compile("^[a-zA-Z0-9\\\\-\\\\_\\\\@\\\\.]{6,64}$");
-
-
-    public static boolean isPostNumber(final String aString) {
-        return aString != null && POST_NUMBER_PATTERN.matcher(aString).matches();
-    }
-
-    public static boolean isNotPostNumber(final String aString) {
-        return !isPostNumber(aString);
-    }
-
-    public static boolean isUserName(final String aString) {
-        return aString != null && USER_NAME_PATTERN.matcher(aString).matches();
-    }
-
-    public static boolean isNotUserName(final String aString) {
-        return !isUserName(aString);
-    }
-
-    public static boolean isJid(final String aString) {
-        return aString != null && JID_PATTERN.matcher(aString).matches();
-    }
-
-    public static boolean isNotJid(final String aString) {
-        return !isJid(aString);
-    }
-
-
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/JidConverter.java b/juick-server-web/src/main/java/com/juick/server/xmpp/JidConverter.java
deleted file mode 100644
index e9a9707e..00000000
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/JidConverter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.juick.server.xmpp;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.lang.Nullable;
-import rocks.xmpp.addr.Jid;
-
-public class JidConverter implements Converter<String, Jid> {
-    @Nullable
-    @Override
-    public Jid convert(String jidStr) {
-        return Jid.of(jidStr);
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java b/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
deleted file mode 100644
index 6956a99a..00000000
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * 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.xmpp.extensions;
-
-import com.juick.Tag;
-import com.juick.xmpp.StanzaChild;
-import com.juick.xmpp.utils.XmlUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-/**
- *
- * @author Ugnich Anton
- */
-public class JuickMessage extends com.juick.Message implements StanzaChild {
-    public final static String XMLNS = "http://juick.com/message";
-    public final static String TagName = "juick";
-    private SimpleDateFormat df;
-    public JuickMessage() {
-        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        df.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
-    @Override
-    public String getXMLNS() {
-        return XMLNS;
-    }
-    @Override
-    public JuickMessage parse(XmlPullParser parser) throws XmlPullParserException, IOException, ParseException {
-        JuickMessage jmsg = new JuickMessage();
-        final String sMID = parser.getAttributeValue(null, "mid");
-        if (sMID != null) {
-            jmsg.setMid(Integer.parseInt(sMID));
-        }
-        final String sRID = parser.getAttributeValue(null, "rid");
-        if (sRID != null) {
-            jmsg.setRid(Integer.parseInt(sRID));
-        }
-        final String sReplyTo = parser.getAttributeValue(null, "replyto");
-        if (sReplyTo != null) {
-            jmsg.setReplyto(Integer.parseInt(sReplyTo));
-        }
-        final String sPrivacy = parser.getAttributeValue(null, "privacy");
-        if (sPrivacy != null) {
-            jmsg.setPrivacy(Integer.parseInt(sPrivacy));
-        }
-        final String sFriendsOnly = parser.getAttributeValue(null, "friendsonly");
-        if (sFriendsOnly != null) {
-            jmsg.FriendsOnly = true;
-        }
-        final String sReadOnly = parser.getAttributeValue(null, "readonly");
-        if (sReadOnly != null) {
-            jmsg.ReadOnly = true;
-        }
-        jmsg.setTimestamp(df.parse(parser.getAttributeValue(null, "ts")).toInstant());
-        jmsg.setAttachmentType(parser.getAttributeValue(null, "attach"));
-        while (parser.next() == XmlPullParser.START_TAG) {
-            final String tag = parser.getName();
-            final String xmlns = parser.getNamespace();
-            if (tag.equals("body")) {
-                jmsg.setText(XmlUtils.getTagText(parser));
-            } else if (tag.equals(JuickUser.TagName) && xmlns != null && xmlns.equals(JuickUser.XMLNS)) {
-                jmsg.setUser(new JuickUser().parse(parser));
-            } else if (tag.equals("tag")) {
-                jmsg.getTags().add(new Tag(XmlUtils.getTagText(parser)));
-            } else {
-                XmlUtils.skip(parser);
-            }
-        }
-        return jmsg;
-    }
-    @Override
-    public String toString() {
-        StringBuilder ret = new StringBuilder("<").append(TagName).append(" xmlns=\"").append(XMLNS).append("\"");
-        if (getMid() > 0) {
-            ret.append(" mid=\"").append(getMid()).append("\"");
-        }
-        if (getRid() > 0) {
-            ret.append(" rid=\"").append(getRid()).append("\"");
-        }
-        if (getReplyto() > 0) {
-            ret.append(" replyto=\"").append(getReplyto()).append("\"");
-        }
-        ret.append(" privacy=\"").append(getPrivacy()).append("\"");
-        if (FriendsOnly) {
-            ret.append(" friendsonly=\"1\"");
-        }
-        if (ReadOnly) {
-            ret.append(" readonly=\"1\"");
-        }
-        if (getTimestamp() != null) {
-            ret.append(" ts=\"").append(df.format(Date.from(getTimestamp()))).append("\"");
-        }
-        if (getAttachmentType() != null) {
-            ret.append(" attach=\"").append(getAttachmentType()).append("\"");
-        }
-        ret.append(">");
-        if (getUser() != null) {
-            ret.append(JuickUser.toString(getUser()));
-        }
-        if (getText() != null) {
-            ret.append("<body>").append(StringEscapeUtils.escapeXml10(StringUtils.defaultString(getText()))).append("</body>");
-        }
-        for (Tag Tag : getTags()) {
-            ret.append("<tag>").append(StringEscapeUtils.escapeXml10(Tag.getName())).append("</tag>");
-        }
-        ret.append("</").append(TagName).append(">");
-        return ret.toString();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof JuickMessage)) {
-            return false;
-        }
-        JuickMessage jmsg = (JuickMessage) obj;
-        return (this.getMid() == jmsg.getMid() && this.getRid() == jmsg.getRid());
-    }
-    @Override
-    public int compareTo(Object obj) throws ClassCastException {
-        if (!(obj instanceof JuickMessage)) {
-            throw new ClassCastException();
-        }
-        JuickMessage jmsg = (JuickMessage) obj;
-        if (this.getMid() != jmsg.getMid()) {
-            if (this.getMid() > jmsg.getMid()) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-        if (this.getRid() != jmsg.getRid()) {
-            if (this.getRid() < jmsg.getRid()) {
-                return -1;
-            } else {
-                return 1;
-            }
-        }
-        return 0;
-    }
-}
\ No newline at end of file
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java b/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
deleted file mode 100644
index 534efcc9..00000000
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * 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.xmpp.extensions;
-import com.juick.xmpp.StanzaChild;
-import com.juick.xmpp.utils.XmlUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-/**
- *
- * @author Ugnich Anton
- */
-public class JuickUser extends com.juick.User implements StanzaChild {
-    public final static String XMLNS = "http://juick.com/user";
-    public final static String TagName = "user";
-    public JuickUser() {
-    }
-    @Override
-    public String getXMLNS() {
-        return XMLNS;
-    }
-    @Override
-    public JuickUser parse(final XmlPullParser parser) throws XmlPullParserException, IOException {
-        JuickUser juser = new JuickUser();
-        String strUID = parser.getAttributeValue(null, "uid");
-        if (strUID != null) {
-            juser.setUid(Integer.parseInt(strUID));
-        }
-        juser.setName(parser.getAttributeValue(null, "uname"));
-        XmlUtils.skip(parser);
-        return juser;
-    }
-    public static String toString(com.juick.User user) {
-        String str = "<" + TagName + " xmlns='" + XMLNS + "'";
-        if (user.getUid() > 0) {
-            str += " uid='" + user.getUid() + "'";
-        }
-        if (user.getName() != null && user.getName().length() > 0) {
-            str += " uname='" + StringEscapeUtils.escapeXml10(user.getName()) + "'";
-        }
-        str += "/>";
-        return str;
-    }
-    @Override
-    public String toString() {
-        return toString(this);
-    }
-}
\ No newline at end of file
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java b/juick-server-web/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
deleted file mode 100644
index 647f2717..00000000
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.xmpp.s2s;
-
-import rocks.xmpp.addr.Jid;
-import rocks.xmpp.core.XmppException;
-import rocks.xmpp.core.session.ConnectionConfiguration;
-import rocks.xmpp.core.session.XmppSession;
-import rocks.xmpp.core.session.XmppSessionConfiguration;
-import rocks.xmpp.core.stanza.model.IQ;
-import rocks.xmpp.core.stanza.model.Message;
-import rocks.xmpp.core.stanza.model.Presence;
-import rocks.xmpp.core.stanza.model.server.ServerIQ;
-import rocks.xmpp.core.stanza.model.server.ServerMessage;
-import rocks.xmpp.core.stanza.model.server.ServerPresence;
-import rocks.xmpp.core.stream.model.StreamElement;
-
-/**
- * Created by vitalyster on 06.02.2017.
- */
-public class BasicXmppSession extends XmppSession {
-    protected BasicXmppSession(String xmppServiceDomain, XmppSessionConfiguration configuration, ConnectionConfiguration... connectionConfigurations) {
-        super(xmppServiceDomain, configuration, connectionConfigurations);
-    }
-
-    public static BasicXmppSession create(String xmppServiceDomain, XmppSessionConfiguration configuration) {
-        BasicXmppSession session = new BasicXmppSession(xmppServiceDomain, configuration);
-        notifyCreationListeners(session);
-        return session;
-    }
-
-    @Override
-    public void connect(Jid from) throws XmppException {
-
-    }
-
-    @Override
-    public Jid getConnectedResource() {
-        return null;
-    }
-
-    @Override
-    protected StreamElement prepareElement(StreamElement element) {
-        if (element instanceof Message) {
-            element = ServerMessage.from((Message) element);
-        } else if (element instanceof Presence) {
-            element = ServerPresence.from((Presence) element);
-        } else if (element instanceof IQ) {
-            element = ServerIQ.from((IQ) element);
-        }
-
-        return element;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/BaseRestService.java b/juick-server-web/src/main/java/com/juick/service/BaseRestService.java
deleted file mode 100644
index 13604a89..00000000
--- a/juick-server-web/src/main/java/com/juick/service/BaseRestService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.service;
-
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Created by vitalyster on 15.12.2016.
- */
-public abstract class BaseRestService {
-    private RestTemplate rest;
-
-    public BaseRestService(RestTemplate rest) {
-        this.rest = rest;
-    }
-
-    public RestTemplate getRest() {
-        return rest;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/ImagesServiceImpl.java b/juick-server-web/src/main/java/com/juick/service/ImagesServiceImpl.java
deleted file mode 100644
index 3a5c77dd..00000000
--- a/juick-server-web/src/main/java/com/juick/service/ImagesServiceImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.juick.service;
-
-import com.juick.Attachment;
-import com.juick.Message;
-import com.juick.Photo;
-import com.juick.server.util.ImageUtils;
-import org.springframework.util.StringUtils;
-
-import java.io.File;
-import java.nio.file.Paths;
-
-public class ImagesServiceImpl implements ImagesService {
-    @Override
-    public void setAttachmentMetadata(String imgDir, String baseUrl, Message msg) throws Exception {
-        if (!StringUtils.isEmpty(msg.getAttachmentType())) {
-            Photo photo = new Photo();
-            if (msg.getRid()> 0) {
-                photo.setSmall(String.format("%sphotos-512/%d-%d.%s", baseUrl, msg.getMid(), msg.getRid(), msg.getAttachmentType()));
-                photo.setMedium(String.format("%sphotos-1024/%d-%d.%s", baseUrl, msg.getMid(), msg.getRid(), msg.getAttachmentType()));
-                photo.setThumbnail(String.format("%sps/%d-%d.%s", baseUrl, msg.getMid(), msg.getRid(), msg.getAttachmentType()));
-            } else {
-                photo.setSmall(String.format("%sphotos-512/%d.%s", baseUrl, msg.getMid(), msg.getAttachmentType()));
-                photo.setMedium(String.format("%sphotos-1024/%d.%s", baseUrl, msg.getMid(), msg.getAttachmentType()));
-                photo.setThumbnail(String.format("%sps/%d.%s", baseUrl, msg.getMid(), msg.getAttachmentType()));
-            }
-            msg.setPhoto(photo);
-            String imageName = String.format("%s.%s", msg.getMid(), msg.getAttachmentType());
-            if (msg.getRid() > 0) {
-                imageName = String.format("%s-%s.%s", msg.getMid(), msg.getRid(), msg.getAttachmentType());
-            }
-            File fullImage = Paths.get(imgDir, "p", imageName).toFile();
-            File mediumImage = Paths.get(imgDir, "photos-1024", imageName).toFile();
-            File smallImage = Paths.get(imgDir, "photos-512", imageName).toFile();
-            File thumbnailImage = Paths.get(imgDir, "ps", imageName).toFile();
-            StringBuilder builder = new StringBuilder();
-            builder.append(baseUrl);
-            builder.append(msg.getAttachmentType().equals("mp4") ? "video" : "p");
-            builder.append("/").append(msg.getMid());
-            if (msg.getRid() > 0) {
-                builder.append("-").append(msg.getRid());
-            }
-            builder.append(".").append(msg.getAttachmentType());
-            String originalUrl =  builder.toString();
-
-            Attachment original = new Attachment();
-            original.setUrl(originalUrl);
-            original.setHeight(ImageUtils.getImageHeight(fullImage));
-            original.setWidth(ImageUtils.getImageWidth(fullImage));
-
-            Attachment medium = new Attachment();
-            medium.setUrl(photo.getMedium());
-            medium.setWidth(ImageUtils.getImageWidth(mediumImage));
-            medium.setHeight(ImageUtils.getImageHeight(mediumImage));
-            original.setMedium(medium);
-
-            Attachment small = new Attachment();
-            small.setUrl(photo.getSmall());
-            small.setWidth(ImageUtils.getImageWidth(smallImage));
-            small.setHeight(ImageUtils.getImageHeight(smallImage));
-            original.setSmall(small);
-
-            Attachment thumb = new Attachment();
-            thumb.setUrl(photo.getMedium());
-            thumb.setWidth(ImageUtils.getImageWidth(thumbnailImage));
-            thumb.setHeight(ImageUtils.getImageHeight(thumbnailImage));
-            original.setThumbnail(thumb);
-
-            msg.setAttachment(original);
-        }
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java b/juick-server-web/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
deleted file mode 100644
index b56b98c8..00000000
--- a/juick-server-web/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.service.security;
-
-import com.juick.User;
-import com.juick.service.security.entities.JuickUser;
-import com.juick.service.UserService;
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.authentication.RememberMeAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.RememberMeServices;
-import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices;
-import org.springframework.util.Assert;
-import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.web.util.WebUtils;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * Created by aalexeev on 4/5/17.
- */
-public class HashParamAuthenticationFilter extends OncePerRequestFilter {
-    public static final String PARAM_NAME = "hash";
-
-    private final UserService userService;
-    private final RememberMeServices rememberMeServices;
-
-
-    public HashParamAuthenticationFilter(
-            final UserService userService,
-            final RememberMeServices rememberMeServices) {
-        Assert.notNull(userService, "userService should not be null");
-        Assert.notNull(rememberMeServices, "rememberMeServices should not be null");
-
-        this.userService = userService;
-        this.rememberMeServices = rememberMeServices;
-    }
-
-    @Override
-    protected void doFilterInternal(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            FilterChain filterChain) throws ServletException, IOException {
-
-        String hash = getHashFromRequest(request);
-
-        if (hash != null && authenticationIsRequired()) {
-            User user = userService.getUserByHash(hash);
-
-            if (!user.isAnonymous()) {
-                User userWithPassword = userService.getFullyUserByName(user.getName());
-                userWithPassword.setAuthHash(userService.getHashByUID(userWithPassword.getUid()));
-                Authentication authentication = new RememberMeAuthenticationToken(
-                        ((AbstractRememberMeServices)rememberMeServices).getKey(), new JuickUser(userWithPassword), JuickUser.USER_AUTHORITY);
-
-                SecurityContextHolder.getContext().setAuthentication(authentication);
-
-                rememberMeServices.loginSuccess(request, response, authentication);
-            }
-        }
-
-        filterChain.doFilter(request, response);
-    }
-
-    private boolean authenticationIsRequired() {
-        Authentication existingAuth = SecurityContextHolder.getContext().getAuthentication();
-
-        return existingAuth == null ||
-                !existingAuth.isAuthenticated() ||
-                existingAuth instanceof AnonymousAuthenticationToken;
-    }
-
-    private String getHashFromRequest(HttpServletRequest request) {
-        String paramHash = request.getParameter(PARAM_NAME);
-        Cookie cookieHash = WebUtils.getCookie(request, PARAM_NAME);
-
-        if (paramHash == null && cookieHash != null) {
-            return cookieHash.getValue();
-        }
-        return paramHash;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/security/JuickUserDetailsService.java b/juick-server-web/src/main/java/com/juick/service/security/JuickUserDetailsService.java
deleted file mode 100644
index f6ae8909..00000000
--- a/juick-server-web/src/main/java/com/juick/service/security/JuickUserDetailsService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.service.security;
-
-import com.juick.service.UserService;
-import com.juick.service.security.entities.JuickUser;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.util.Assert;
-
-/**
- * Created by aalexeev on 11/28/16.
- */
-public class JuickUserDetailsService implements UserDetailsService {
-    private final UserService userService;
-
-    public JuickUserDetailsService(final UserService userService) {
-        Assert.notNull(userService, "UserService must be initialized");
-        this.userService = userService;
-    }
-
-    @Override
-    public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException {
-        if (StringUtils.isBlank(username))
-            throw new UsernameNotFoundException("Invalid user name " + username);
-
-        com.juick.User user = userService.getFullyUserByName(username);
-
-        if (user != null) {
-            user.setAuthHash(userService.getHashByUID(user.getUid()));
-            return new JuickUser(user);
-        }
-
-        throw new UsernameNotFoundException("The username " + username + " is not found");
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/security/NotAuthorizedAuthenticationEntryPoint.java b/juick-server-web/src/main/java/com/juick/service/security/NotAuthorizedAuthenticationEntryPoint.java
deleted file mode 100644
index b9bdcaa9..00000000
--- a/juick-server-web/src/main/java/com/juick/service/security/NotAuthorizedAuthenticationEntryPoint.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.service.security;
-
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * Created by vitalyster on 25.11.2016.
- */
-public class NotAuthorizedAuthenticationEntryPoint implements AuthenticationEntryPoint {
-    @Override
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) {
-        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/security/NullUserDetailsService.java b/juick-server-web/src/main/java/com/juick/service/security/NullUserDetailsService.java
deleted file mode 100644
index 91acefa3..00000000
--- a/juick-server-web/src/main/java/com/juick/service/security/NullUserDetailsService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.service.security;
-
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-/**
- * Created by aalexeev on 11/28/16.
- */
-public class NullUserDetailsService implements UserDetailsService {
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        throw new UsernameNotFoundException(
-                "loadUserByUsername called for NullUserDetailsService, user " + username + "can not be found");
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java b/juick-server-web/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
deleted file mode 100644
index a8b956c1..00000000
--- a/juick-server-web/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.service.security.deprecated;
-
-import com.juick.User;
-import com.juick.server.util.HashUtils;
-import com.juick.service.security.entities.JuickUser;
-import com.juick.service.UserService;
-import com.juick.service.security.NullUserDetailsService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.env.Environment;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.web.authentication.RememberMeServices;
-import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices;
-import org.springframework.security.web.authentication.rememberme.InvalidCookieException;
-import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException;
-import org.springframework.util.Assert;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Optional;
-
-/**
- * Created by aalexeev on 11/28/16.
- *
- * @deprecated not recommended use for secure reasons
- */
-@Deprecated
-public class CookieSimpleHashRememberMeServices extends AbstractRememberMeServices implements RememberMeServices {
-    private static final Logger logger = LoggerFactory.getLogger(CookieSimpleHashRememberMeServices.class);
-
-    private static final String COOKIE_PARAM_NAME = "hash";
-
-    private final UserService userService;
-
-    public CookieSimpleHashRememberMeServices(
-            final String key, final UserService userService, final Environment environment) {
-        super(key, new NullUserDetailsService());
-
-        Assert.notNull(userService);
-        Assert.notNull(environment);
-
-        this.userService = userService;
-
-        setCookieName(COOKIE_PARAM_NAME);
-        setCookieDomain(environment.getProperty("web_domain", "localhost"));
-        setAlwaysRemember(true);
-    }
-
-    @Override
-    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-        super.logout(request, response, authentication);
-        userService.deleteLoginForUser(authentication.getName());
-    }
-
-    @Override
-    protected void onLoginSuccess(
-            HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
-        String username = successfulAuthentication.getName();
-
-        logger.debug("Creating new persistent login for user {}", username);
-
-        try {
-            int uid = userService.getUIDbyName(username);
-
-            Assert.isTrue(uid > 0);
-
-            String hash = HashUtils.generateHash(16);
-
-            userService.setLoginForUser(uid, hash);
-
-            setCookie(new String[]{hash}, getTokenValiditySeconds(), request, response);
-        } catch (Exception e) {
-            logger.error("Failed to save cookies", e);
-        }
-    }
-
-    @Override
-    protected UserDetails processAutoLoginCookie(
-            String[] cookieTokens, HttpServletRequest request, HttpServletResponse response)
-            throws RememberMeAuthenticationException, UsernameNotFoundException {
-        String hash = cookieTokens[0];
-
-        if (StringUtils.isBlank(hash)) {
-            hash = request.getParameter("hash");
-        }
-        if (StringUtils.isBlank(hash)) {
-            throw new InvalidCookieException("Cookie is invalid and hash parameter not found");
-        }
-
-        int uid = userService.getUIDbyHash(hash);
-        if (uid <= 0)
-            throw new UsernameNotFoundException("User not found by hash, cookies" + cookieTokens);
-
-        Optional<User> userOptional = userService.getUserByUID(uid);
-
-        Assert.isTrue(userOptional.isPresent());
-
-        return new JuickUser(userOptional.get());
-    }
-
-    @Override
-    protected String[] decodeCookie(String cookieValue) throws InvalidCookieException {
-        return new String[]{cookieValue};
-    }
-
-    @Override
-    protected String encodeCookie(String[] cookieTokens) {
-        return cookieTokens != null && cookieTokens.length > 0 ? cookieTokens[0] : StringUtils.EMPTY;
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java b/juick-server-web/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
deleted file mode 100644
index 04794d07..00000000
--- a/juick-server-web/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.service.security.deprecated;
-
-import com.juick.User;
-import com.juick.service.security.entities.JuickUser;
-import com.juick.service.UserService;
-import com.juick.service.security.NullUserDetailsService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.web.authentication.RememberMeServices;
-import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices;
-import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException;
-import org.springframework.util.Assert;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Created by aalexeev on 11/30/16.
- *
- * @deprecated for security reasons
- */
-@Deprecated
-public class RequestParamHashRememberMeServices extends AbstractRememberMeServices implements RememberMeServices {
-    private static final String PARAM_NAME = "hash";
-
-    private final UserService userService;
-
-    public RequestParamHashRememberMeServices(String key, UserService userService) {
-        super(key, new NullUserDetailsService());
-
-        Assert.notNull(userService);
-        this.userService = userService;
-        setAlwaysRemember(false);
-    }
-
-    @Override
-    protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
-        // do nothing
-    }
-
-    @Override
-    protected boolean rememberMeRequested(HttpServletRequest request, String parameter) {
-        return false; // always false
-    }
-
-    @Override
-    protected void cancelCookie(HttpServletRequest request, HttpServletResponse response) {
-        // do nothing
-    }
-
-    @Override
-    protected String extractRememberMeCookie(HttpServletRequest request) {
-        return PARAM_NAME; // return any not blank value
-    }
-
-    @Override
-    protected UserDetails processAutoLoginCookie(
-            String[] cookieTokens, HttpServletRequest request, HttpServletResponse response)
-            throws RememberMeAuthenticationException, UsernameNotFoundException {
-        String hash = request.getParameter(PARAM_NAME);
-
-        if (StringUtils.isNotBlank(hash)) {
-            User user = userService.getUserByHash(hash);
-            if (user.getUid() > 0)
-                return new JuickUser(user);
-        }
-        throw new UsernameNotFoundException("User not found by hash " + hash);
-    }
-}
diff --git a/juick-server-web/src/main/java/com/juick/service/security/entities/JuickUser.java b/juick-server-web/src/main/java/com/juick/service/security/entities/JuickUser.java
deleted file mode 100644
index 6e72117e..00000000
--- a/juick-server-web/src/main/java/com/juick/service/security/entities/JuickUser.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.service.security.entities;
-
-import com.juick.User;
-import com.juick.server.helpers.AnonymousUser;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/21/16.
- */
-public class JuickUser implements UserDetails {
-    static final GrantedAuthority ROLE_USER = new SimpleGrantedAuthority("ROLE_USER");
-    static final GrantedAuthority ROLE_ANONYMOUS = new SimpleGrantedAuthority("ROLE_ANONYMOUS");
-
-    public static final List<GrantedAuthority> USER_AUTHORITY = Collections.singletonList(ROLE_USER);
-    public static final List<GrantedAuthority> ANONYMOUS_AUTHORITY = Collections.singletonList(ROLE_ANONYMOUS);
-
-    public static final JuickUser ANONYMOUS_USER = new JuickUser(AnonymousUser.INSTANCE, ANONYMOUS_AUTHORITY);
-
-    private final com.juick.User user;
-    private final Collection<? extends GrantedAuthority> authorities;
-
-    public JuickUser(com.juick.User user) {
-        this(user, USER_AUTHORITY);
-    }
-
-    public JuickUser(com.juick.User user, Collection<? extends GrantedAuthority> authorities) {
-        this.user = user;
-        this.authorities = authorities;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return authorities;
-    }
-
-    @Override
-    public String getPassword() {
-        return "{noop}" + user.getCredentials();
-    }
-
-    @Override
-    public String getUsername() {
-        return user.getName();
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return !user.isBanned();
-    }
-
-    public User getUser() {
-        return user;
-    }
-}
diff --git a/juick-server-web/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java b/juick-server-web/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
deleted file mode 100644
index bbf35996..00000000
--- a/juick-server-web/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 rocks.xmpp.core.session.debug;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import rocks.xmpp.core.session.XmppSession;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Created by vitalyster on 17.11.2016.
- */
-public class LogbackDebugger implements XmppDebugger {
-    private Logger logger;
-
-    @Override
-    public void initialize(XmppSession xmppSession) {
-        logger = LoggerFactory.getLogger(xmppSession.getClass());
-    }
-
-    @Override
-    public void writeStanza(String s, Object o) {
-        logger.debug("OUT: {}", s);
-    }
-
-    @Override
-    public void readStanza(String s, Object o) {
-        logger.debug("IN: {}", s);
-    }
-
-    @Override
-    public OutputStream createOutputStream(OutputStream outputStream) {
-        return outputStream;
-    }
-
-    @Override
-    public InputStream createInputStream(InputStream inputStream) {
-        return inputStream;
-    }
-}