aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/juick/config')
-rw-r--r--src/main/java/com/juick/config/XMPPConfig.java48
1 files changed, 3 insertions, 45 deletions
diff --git a/src/main/java/com/juick/config/XMPPConfig.java b/src/main/java/com/juick/config/XMPPConfig.java
index 534909a5..ee2abab4 100644
--- a/src/main/java/com/juick/config/XMPPConfig.java
+++ b/src/main/java/com/juick/config/XMPPConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2020, Juick
+ * Copyright (C) 2008-2022, 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
@@ -17,58 +17,16 @@
package com.juick.config;
-import com.juick.CommandsManager;
import com.juick.XMPPManager;
-
-import com.juick.service.MessagesService;
-import com.juick.service.PMQueriesService;
-import com.juick.service.StorageService;
-import com.juick.service.UserService;
-import com.juick.www.WebApp;
-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.core.io.Resource;
-import rocks.xmpp.addr.Jid;
-
-import javax.inject.Inject;
-import java.util.concurrent.Executor;
@Configuration
@ConditionalOnProperty("xmppbot_jid")
public class XMPPConfig {
- @Value("${xmppbot_jid:juick@localhost}")
- private String botJid;
- @Value("${hostname:localhost}")
- private String componentName;
- @Value("${component_port:5347}")
- private int componentPort;
- @Value("${component_host:localhost}")
- private String componentHost;
- @Inject
- private CommandsManager commandsManager;
- @Value("${xmpp_password:secret}")
- private String password;
- @Value("classpath:juick.png")
- private Resource vCardImage;
- @Inject
- private StorageService storageService;
- @Inject
- private MessagesService messagesService;
- @Inject
- private UserService userService;
- @Inject
- private PMQueriesService pmQueriesService;
- @Inject
- private Executor applicationTaskExecutor;
- @Inject
- private WebApp webApp;
-
- @Bean
+ @Bean(destroyMethod = "close")
XMPPManager xmppConnection() {
- return new XMPPManager(commandsManager, Jid.of(botJid), componentName, componentPort,
- componentHost, password, storageService, vCardImage, messagesService, userService, pmQueriesService,
- applicationTaskExecutor, webApp);
+ return new XMPPManager();
}
}