From 7a2f89266c8f6337e4e81a2fd8488e0f80f4f9bd Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 3 Apr 2020 23:53:23 +0300
Subject: Reorganize layout and code cleanup

---
 .../com/juick/server/configuration/ActivityPubClientConfig.java     | 2 +-
 .../java/com/juick/server/configuration/ApiAppConfiguration.java    | 4 ++--
 .../java/com/juick/server/configuration/BaseWebConfiguration.java   | 3 ---
 src/main/java/com/juick/server/configuration/SecurityConfig.java    | 6 ------
 .../java/com/juick/server/configuration/WwwAppConfiguration.java    | 6 +-----
 src/main/java/com/juick/server/configuration/XMPPConfig.java        | 2 --
 6 files changed, 4 insertions(+), 19 deletions(-)

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

diff --git a/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java b/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
index 35d5d043..56edffa7 100644
--- a/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
+++ b/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
@@ -18,7 +18,7 @@
 package com.juick.server.configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.juick.server.api.activity.model.Activity;
+import com.juick.www.api.activity.model.Activity;
 import com.juick.server.helpers.HeaderRequestInterceptor;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
diff --git a/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
index d2c10411..75d247bf 100644
--- a/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
@@ -17,8 +17,8 @@
 
 package com.juick.server.configuration;
 
-import com.juick.server.api.rss.MessagesView;
-import com.juick.server.api.rss.RepliesView;
+import com.juick.www.rss.MessagesView;
+import com.juick.www.rss.RepliesView;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;
diff --git a/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index f8357b42..e84c0c40 100644
--- a/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
@@ -24,12 +24,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
 
-import java.util.concurrent.Executor;
-
 /**
  * Created by vitalyster on 28.06.2016.
  */
diff --git a/src/main/java/com/juick/server/configuration/SecurityConfig.java b/src/main/java/com/juick/server/configuration/SecurityConfig.java
index 23a41e11..0fab087f 100644
--- a/src/main/java/com/juick/server/configuration/SecurityConfig.java
+++ b/src/main/java/com/juick/server/configuration/SecurityConfig.java
@@ -59,10 +59,6 @@ import java.util.concurrent.TimeUnit;
 public class SecurityConfig {
     @Resource
     private UserService userService;
-    @Value("${auth_remember_me_key:secret}")
-    private String rememberMeKey;
-    @Value("${web_domain:localhost}")
-    private String webDomain;
 
     private static final String COOKIE_NAME = "juick-remember-me";
 
@@ -90,8 +86,6 @@ public class SecurityConfig {
     public static class ApiConfig extends WebSecurityConfigurerAdapter {
         @Value("${auth_remember_me_key:secret}")
         private String rememberMeKey;
-        @Value("${web_domain:localhost}")
-        private String webDomain;
         @Resource
         private UserService userService;
         @Resource
diff --git a/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
index e8733e35..8e874e43 100644
--- a/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java
@@ -17,7 +17,7 @@
 
 package com.juick.server.configuration;
 
-import com.juick.www.HelpService;
+import com.juick.service.HelpService;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
 import com.mitchellbosecke.pebble.PebbleEngine;
@@ -54,10 +54,6 @@ import java.util.concurrent.TimeUnit;
 @Configuration
 @EnableCaching
 public class WwwAppConfiguration implements WebMvcConfigurer {
-    @Inject
-    private UserService userService;
-    @Inject
-    private TagService tagService;
     @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
     private String imgDir;
     @Bean
diff --git a/src/main/java/com/juick/server/configuration/XMPPConfig.java b/src/main/java/com/juick/server/configuration/XMPPConfig.java
index a002493e..62e19c71 100644
--- a/src/main/java/com/juick/server/configuration/XMPPConfig.java
+++ b/src/main/java/com/juick/server/configuration/XMPPConfig.java
@@ -29,8 +29,6 @@ import org.springframework.format.support.DefaultFormattingConversionService;
 @Configuration
 @ConditionalOnProperty("xmppbot_jid")
 public class XMPPConfig {
-    @Value("${hostname:localhost}")
-    private String hostname;
     @Bean
     public static ConversionService conversionService() {
         DefaultFormattingConversionService cs = new DefaultFormattingConversionService();
-- 
cgit v1.2.3