configurations clean-up, import is redundant

7 files changed, 1 insertions, 13 deletions

diff --git a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
index 91a886b3..95449589 100644
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
+++ b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
@@ -1,11 +1,9 @@
 package com.juick.components.configuration;
 
 import com.juick.components.Crosspost;
-import com.juick.configuration.DataConfiguration;
 import com.juick.service.CrosspostService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 
@@ -16,7 +14,6 @@ import javax.inject.Inject;
  */
 @Configuration
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
 public class CrosspostAppConfiguration {
     @Inject
     private Environment env;
diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java
index 1bb4694a..ff3a5a5a 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java
@@ -23,7 +23,6 @@ import java.util.List;
  */
 @Configuration
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
 public class NotificationsAppConfiguration {
     @Inject
     private Environment env;
diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 4c20001a..fea6959f 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -1,11 +1,9 @@
 package com.juick.ws.configuration;
 
-import com.juick.configuration.DataConfiguration;
 import com.juick.ws.WebsocketComponent;
 import com.juick.ws.XMPPConnection;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
@@ -22,7 +20,6 @@ import javax.inject.Inject;
 @Configuration
 @EnableWebSocket
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
 class WebsocketConfiguration implements WebSocketConfigurer {
     @Inject
     private Environment env;
diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
index a754f1a9..bbbcc6a4 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
@@ -13,7 +13,7 @@ public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServ
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{WebsocketConfiguration.class};
+        return new Class<?>[]{WebsocketConfiguration.class, DataConfiguration.class};
     }
 
     @Override
diff --git a/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java b/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java
index d1a1ed11..0c5f10c1 100644
--- a/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java
+++ b/juick-xmpp-bot/src/main/java/com/juick/components/configuration/BotAppConfiguration.java
@@ -1,10 +1,8 @@
 package com.juick.components.configuration;
 
 import com.juick.components.XMPPBot;
-import com.juick.configuration.DataConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 
@@ -15,7 +13,6 @@ import javax.inject.Inject;
  */
 @Configuration
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
 public class BotAppConfiguration {
     @Inject
     private Environment env;
diff --git a/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferAppConfiguration.java b/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferAppConfiguration.java
index ce7509c4..e52a604a 100644
--- a/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferAppConfiguration.java
+++ b/juick-xmpp-ft/src/main/java/com/juick/components/configuration/FileTransferAppConfiguration.java
@@ -15,7 +15,6 @@ import javax.inject.Inject;
  */
 @Configuration
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
 public class FileTransferAppConfiguration {
     @Inject
     private Environment env;
diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java
index eb3dd726..96cf8909 100644
--- a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java
+++ b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java
@@ -19,7 +19,6 @@ import java.util.concurrent.Executors;
 
 @Configuration
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
 public class XmppAppConfiguration {
     @Inject
     private Environment env;