Initialize all components from configuration

4 files changed, 8 insertions, 10 deletions

diff --git a/src/test/java/com/juick/server/configuration/DataSourceAutoConfiguration.java b/src/test/java/com/juick/config/DataSourceAutoConfiguration.java
index bd0a3124..b30de7fc 100644
--- a/src/test/java/com/juick/server/configuration/DataSourceAutoConfiguration.java
+++ b/src/test/java/com/juick/config/DataSourceAutoConfiguration.java
@@ -14,7 +14,7 @@
  * 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.configuration;
+package com.juick.config;
 
 import ch.vorburger.mariadb4j.springframework.MariaDB4jSpringService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/src/test/java/com/juick/server/configuration/SwaggerConfiguration.java b/src/test/java/com/juick/config/SwaggerConfiguration.java
index ef63c69e..f92ef6c0 100644
--- a/src/test/java/com/juick/server/configuration/SwaggerConfiguration.java
+++ b/src/test/java/com/juick/config/SwaggerConfiguration.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.server.configuration;
+package com.juick.config;
 
 import com.google.common.base.Predicates;
 import org.springframework.context.annotation.Bean;
diff --git a/src/test/java/com/juick/server/configuration/TestActivityConfiguration.java b/src/test/java/com/juick/config/TestActivityConfiguration.java
index 7c1aa8bf..94b96bdf 100644
--- a/src/test/java/com/juick/server/configuration/TestActivityConfiguration.java
+++ b/src/test/java/com/juick/config/TestActivityConfiguration.java
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.server.configuration;
+package com.juick.config;
 
-import com.juick.server.KeystoreManager;
+import com.juick.KeystoreManager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index 80c8fe4e..51e17ecc 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -29,7 +29,9 @@ import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.github.scribejava.apis.AppleClientSecretGenerator;
 import com.jayway.jsonpath.JsonPath;
-import com.juick.formatters.PlainTextFormatter;
+import com.juick.*;
+import com.juick.util.*;
+import com.juick.util.formatters.PlainTextFormatter;
 import com.juick.model.*;
 import com.juick.server.*;
 import com.juick.www.api.SystemActivity;
@@ -41,15 +43,11 @@ import com.juick.www.api.activity.model.objects.Note;
 import com.juick.www.api.activity.model.objects.Person;
 import com.juick.www.api.webfinger.model.Account;
 import com.juick.www.api.xnodeinfo2.model.NodeInfo;
-import com.juick.server.util.HttpUtils;
-import com.juick.server.util.ImageUtils;
 import com.juick.www.WebApp;
 import com.juick.service.*;
 import com.juick.service.activities.UpdateEvent;
 import com.juick.service.component.SystemEvent;
 import com.juick.test.util.MockUtils;
-import com.juick.util.DateFormattersHolder;
-import com.juick.util.MessageUtils;
 import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.error.PebbleException;
 import com.mitchellbosecke.pebble.template.PebbleTemplate;
@@ -1782,7 +1780,7 @@ public class ServerTests {
 
     @Test
     public void escapeSqlTests() {
-        String sql = String.format("SELECT * FROM table WHERE data='%s'", Utils.encodeSphinx("';-- DROP TABLE table"));
+        String sql = String.format("SELECT * FROM table WHERE data='%s'", WebUtils.encodeSphinx("';-- DROP TABLE table"));
         assertThat(sql, is("SELECT * FROM table WHERE data='\\';-- DROP TABLE table\'"));
     }