From dcf1b9e5e4312cfd685c1f3cb0f819e7ac64be75 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 31 Dec 2018 01:35:11 +0300
Subject: XMPP cleanup

---
 .../com/juick/server/configuration/XMPPConfig.java | 23 +++-------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'src/main/java/com/juick/server/configuration')

diff --git a/src/main/java/com/juick/server/configuration/XMPPConfig.java b/src/main/java/com/juick/server/configuration/XMPPConfig.java
index ffacf4ef..f9b6f092 100644
--- a/src/main/java/com/juick/server/configuration/XMPPConfig.java
+++ b/src/main/java/com/juick/server/configuration/XMPPConfig.java
@@ -1,21 +1,13 @@
 package com.juick.server.configuration;
 
-import com.juick.server.XMPPConnection;
+import com.juick.server.XMPPManager;
 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.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import rocks.xmpp.core.session.Extension;
-import rocks.xmpp.core.session.XmppSessionConfiguration;
-import rocks.xmpp.core.session.debug.LogbackDebugger;
-
-import java.time.Duration;
 
 @Configuration
 @ConditionalOnProperty("xmppbot_jid")
@@ -23,22 +15,13 @@ public class XMPPConfig {
     @Value("${hostname:localhost}")
     private String hostname;
     @Bean
-    public BasicXmppSession session() {
-        XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
-                .extensions(Extension.of(com.juick.Message.class), Extension.of(MessageQuery.class))
-                .debugger(LogbackDebugger.class)
-                .defaultResponseTimeout(Duration.ofMillis(120000))
-                .build();
-        return BasicXmppSession.create(hostname, configuration);
-    }
-    @Bean
     public static ConversionService conversionService() {
         DefaultFormattingConversionService cs = new DefaultFormattingConversionService();
         cs.addConverter(new JidConverter());
         return cs;
     }
     @Bean
-    public XMPPConnection xmppConnection() {
-        return new XMPPConnection();
+    public XMPPManager xmppConnection() {
+        return new XMPPManager();
     }
 }
-- 
cgit v1.2.3