www: no more xmpp

11 files changed, 5 insertions, 315 deletions

diff --git a/juick-common/build.gradle b/juick-common/build.gradle
index 39061697..bb21aee7 100644
--- a/juick-common/build.gradle
+++ b/juick-common/build.gradle
@@ -5,8 +5,10 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-security")
     compile("org.springframework.boot:spring-boot-starter-web")
     compile("org.springframework.boot:spring-boot-starter-websocket")
+    compile("org.springframework.boot:spring-boot-starter-json")
     compile "org.apache.commons:commons-lang3:3.7"
     compile "org.apache.commons:commons-collections4:4.1"
+    compile 'org.apache.commons:commons-text:1.3'
     compile "commons-codec:commons-codec:1.11"
     compile "commons-io:commons-io:2.6"
     compile 'com.google.code.findbugs:jsr305:3.0.2'
@@ -15,14 +17,6 @@ dependencies {
     compile "org.apache.commons:commons-imaging:1.0-SNAPSHOT"
     runtime "commons-fileupload:commons-fileupload:1.3.3"
 
-    compile ('com.github.juick:com.juick.xmpp:658f8cf751') {
-        exclude group: 'xmlpull'
-    }
-    compile 'xpp3:xpp3:1.1.4c'
-
-    compile "rocks.xmpp:xmpp-core-client:0.7.5"
-    compile "rocks.xmpp:xmpp-extensions-client:0.7.5"
-
     compile "javax.inject:javax.inject:1"
     compile "javax.xml.bind:jaxb-api:2.3.0"
     compile 'org.glassfish.jaxb:jaxb-runtime:2.3.0'
diff --git a/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index 5880fd5c..9063e665 100644
--- a/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
@@ -21,22 +21,13 @@ 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.iq.MessageQuery;
-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.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
-import rocks.xmpp.core.session.Extension;
-import rocks.xmpp.core.session.XmppSessionConfiguration;
-import rocks.xmpp.core.session.debug.LogbackDebugger;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
@@ -78,25 +69,9 @@ public class BaseWebConfiguration implements WebMvcConfigurer, SchedulingConfigu
     public Executor taskExecutor() {
         return Executors.newScheduledThreadPool(100);
     }
-    @Value("${hostname:localhost}")
-    private String hostname;
 
     @Bean
     public ExecutorService executorService() {
         return Executors.newCachedThreadPool();
     }
-    @Bean
-    public BasicXmppSession session() {
-        XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
-                .extensions(Extension.of(com.juick.Message.class), Extension.of(MessageQuery.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-common/src/main/java/com/juick/server/helpers/CommandResult.java b/juick-common/src/main/java/com/juick/server/helpers/CommandResult.java
index a772153b..a5baaee0 100644
--- a/juick-common/src/main/java/com/juick/server/helpers/CommandResult.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/CommandResult.java
@@ -1,5 +1,6 @@
 package com.juick.server.helpers;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.juick.Message;
 
 import java.util.Optional;
@@ -17,7 +18,7 @@ public class CommandResult {
     }
 
     public Optional<Message> getNewMessage() {
-        return Optional.of(newMessage);
+        return Optional.ofNullable(newMessage);
     }
     public static CommandResult build(Message newMessage, String text, String markdown) {
         CommandResult result = new CommandResult();
diff --git a/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java b/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java
index 1c3b4e66..242f2b09 100644
--- a/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java
+++ b/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java
@@ -27,6 +27,6 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 @ResponseStatus(value = HttpStatus.BAD_REQUEST)
 public class HttpBadRequestException extends RuntimeException {
     public HttpBadRequestException() {
-        super(StringUtils.EMPTY, null, false, false);
+        super("the request was bad", null, false, false);
     }
 }
diff --git a/juick-common/src/main/java/com/juick/server/xmpp/JidConverter.java b/juick-common/src/main/java/com/juick/server/xmpp/JidConverter.java
deleted file mode 100644
index e9a9707e..00000000
--- a/juick-common/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-common/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java b/juick-common/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java
deleted file mode 100644
index 7500cbf8..00000000
--- a/juick-common/src/main/java/com/juick/server/xmpp/iq/MessageQuery.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.juick.server.xmpp.iq;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "query")
-public class MessageQuery {
-    private MessageQuery() {
-
-    }
-}
diff --git a/juick-common/src/main/java/com/juick/server/xmpp/iq/package-info.java b/juick-common/src/main/java/com/juick/server/xmpp/iq/package-info.java
deleted file mode 100644
index dada8289..00000000
--- a/juick-common/src/main/java/com/juick/server/xmpp/iq/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlSchema(namespace = "http://juick.com/query#messages", elementFormDefault = XmlNsForm.QUALIFIED)
-package com.juick.server.xmpp.iq;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
\ No newline at end of file
diff --git a/juick-common/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java b/juick-common/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
deleted file mode 100644
index 647f2717..00000000
--- a/juick-common/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-common/src/main/java/com/juick/service/BaseRestService.java b/juick-common/src/main/java/com/juick/service/BaseRestService.java
deleted file mode 100644
index 13604a89..00000000
--- a/juick-common/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-common/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java b/juick-common/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
deleted file mode 100644
index aae49bc7..00000000
--- a/juick-common/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("com.juick.server.xmpp");
-    }
-
-    @Override
-    public void writeStanza(String s, Object o) {
-        logger.info("OUT: {}", s);
-    }
-
-    @Override
-    public void readStanza(String s, Object o) {
-        logger.info("IN: {}", s);
-    }
-
-    @Override
-    public OutputStream createOutputStream(OutputStream outputStream) {
-        return outputStream;
-    }
-
-    @Override
-    public InputStream createInputStream(InputStream inputStream) {
-        return inputStream;
-    }
-}
diff --git a/juick-common/src/test/java/com/juick/MessageTest.java b/juick-common/src/test/java/com/juick/MessageTest.java
index d3205876..7d11503d 100644
--- a/juick-common/src/test/java/com/juick/MessageTest.java
+++ b/juick-common/src/test/java/com/juick/MessageTest.java
@@ -17,42 +17,13 @@
 
 package com.juick;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.juick.util.DateFormattersHolder;
 import com.juick.util.MessageUtils;
-import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.json.JSONObject;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-import rocks.xmpp.addr.Jid;
-import rocks.xmpp.core.session.Extension;
-import rocks.xmpp.core.session.XmppSession;
-import rocks.xmpp.core.session.XmppSessionConfiguration;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.ParseException;
-import java.time.Instant;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertEquals;
 
 /**
  * Created by aalexeev on 12/7/16.
@@ -185,63 +156,4 @@ public class MessageTest {
         assertThat(StringUtils.countMatches(MessageUtils.getTagsString(message), "*test"), equalTo(1));
         assertThat(StringUtils.countMatches(MessageUtils.getTagsString(message), "*ab"), equalTo(1));
     }
-    @Test
-    public void tagsShouldBeDeserializedFromXml() throws JAXBException {
-        XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
-                .extensions(Extension.of(com.juick.Message.class))
-                .build();
-        XmppSession xmpp = new XmppSession("juick.com", configuration) {
-            @Override
-            public void connect(Jid from) {
-
-            }
-
-            @Override
-            public Jid getConnectedResource() {
-                return null;
-            }
-        };
-        String tag = "<tag xmlns='http://juick.com/message'>yo</tag>";
-        String xml = "<message xmlns='jabber:client' from='juick@juick.com' type='chat'><body>yo</body><juick mid='1' ts='2017-09-14' uid='1' uname='ugnich' xmlns='http://juick.com/message'><body>yo</body><user uid='1' uname='ugnich' xmlns='http://juick.com/user'/><tag>yo</tag><tag>people</tag></juick></message>";
-        Unmarshaller unmarshaller = xmpp.createUnmarshaller();
-        rocks.xmpp.core.stanza.model.Message xmppMessage = (rocks.xmpp.core.stanza.model.Message) unmarshaller.unmarshal(new StringReader(xml));
-        Tag xmlTag = (Tag) unmarshaller.unmarshal(new StringReader(tag));
-        assertThat(xmlTag.getName(), equalTo("yo"));
-        Message juickMessage = xmppMessage.getExtension(Message.class);
-        assertThat(juickMessage.getTags().get(0).getName(), equalTo("yo"));
-    }
-    @Test
-    public void messageParserSerializer() throws ParseException, ParserConfigurationException,
-            IOException, SAXException, JAXBException {
-        Message msg = new Message();
-        msg.setTags(MessageUtils.parseTags("test test" + (char) 0xA0 + "2 test3"));
-        assertEquals("First tag must be", "test", msg.getTags().get(0).getName());
-        assertEquals("Third tag must be", "test3", msg.getTags().get(2).getName());
-        assertEquals("Count of tags must be", 3, msg.getTags().size());
-        Instant currentDate = Instant.now();
-        msg.setTimestamp(currentDate);
-        ObjectMapper serializer = new ObjectMapper();
-        serializer.registerModule(new Jdk8Module());
-        serializer.registerModule(new JavaTimeModule());
-        String jsonMessage = serializer.writeValueAsString(msg);
-        JSONObject jsonObject = new JSONObject(jsonMessage);
-        assertEquals("date should be in timestamp field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate),
-                jsonObject.getString("timestamp"));
-
-
-        JAXBContext context = JAXBContext
-                .newInstance(Message.class);
-        Marshaller m = context.createMarshaller();
-
-        StringWriter sw = new StringWriter();
-        m.marshal(msg, sw);
-
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        Document doc = db.parse(new ByteArrayInputStream(sw.toString().getBytes(CharEncoding.UTF_8)));
-        Node juickNode = doc.getElementsByTagName("juick").item(0);
-        NamedNodeMap attrs = juickNode.getAttributes();
-        assertEquals("date should be in ts field", DateFormattersHolder.getMessageFormatterInstance().format(currentDate),
-                attrs.getNamedItem("ts").getNodeValue());
-    }
 }