Merge remote-tracking branch 'personal/master'

airsonic-main/src/main/java/org/airsonic/player/Application.java

@@ -1,8 +1,7 @@
-package org.airsonic.player.boot;
+package org.airsonic.player;
 
 import net.sf.ehcache.constructs.web.ShutdownListener;
 import org.airsonic.player.filter.*;
-import org.airsonic.player.spring.CustomPropertySourceConfigurer;
 import org.directwebremoting.servlet.DwrServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -180,7 +179,7 @@ public class Application extends SpringBootServletInitializer implements Embedde
         // Customize the application or call application.sources(...) to add sources
         // Since our example is itself a @Configuration class (via @SpringBootApplication)
         // we actually don't need to override this method.
-        return application.sources(Application.class).web(true).initializers(new CustomPropertySourceConfigurer());
+        return application.sources(Application.class).web(true);
     }
 
     @Override

airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java

@@ -1,4 +1,4 @@
-package org.airsonic.player.boot;
+package org.airsonic.player;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Wrapper;

airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java

@@ -21,6 +21,7 @@ public class SpringLiquibase extends liquibase.integration.spring.SpringLiquibas
 
     @Override
     public void afterPropertiesSet() throws LiquibaseException {
+        logger.trace("Starting Liquibase Update");
         try {
             super.afterPropertiesSet();
         } catch(Exception e) {

airsonic-main/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,6 @@
 org.springframework.context.ApplicationListener=\
   org.airsonic.player.spring.LoggingFileOverrideListener,\
   org.airsonic.player.security.LoginFailureListener
+
+org.springframework.context.ApplicationContextInitializer=\
+  org.airsonic.player.spring.CustomPropertySourceConfigurer

airsonic-main/src/main/resources/applicationContext-service.xml

@@ -123,7 +123,10 @@
 
     <bean id="networkService" class="org.airsonic.player.service.NetworkService" />
 
-    <bean id="playerService" class="org.airsonic.player.service.PlayerService" init-method="init">
+    <bean id="playerService"
+          class="org.airsonic.player.service.PlayerService"
+          init-method="init"
+          depends-on="liquibase">
         <property name="playerDao" ref="playerDao"/>
         <property name="statusService" ref="statusService"/>
         <property name="securityService" ref="securityService"/>

airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestExport.java

@@ -2,8 +2,10 @@ package org.airsonic.player.service;
 
 import com.google.common.collect.Lists;
 import org.airsonic.player.dao.MediaFileDao;
+import org.airsonic.player.dao.PlaylistDao;
 import org.airsonic.player.domain.MediaFile;
 import org.airsonic.player.domain.Playlist;
+import org.airsonic.player.service.playlist.DefaultPlaylistExportHandler;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.junit.Assert;
@@ -12,19 +14,17 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
-import org.airsonic.player.dao.PlaylistDao;
-import org.airsonic.player.service.playlist.DefaultPlaylistExportHandler;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)

airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.java

@@ -19,7 +19,7 @@ import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
 import java.io.ByteArrayInputStream;
@@ -30,7 +30,6 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -190,7 +189,7 @@ public class PlaylistServiceTestImport {
 
         @Override
         public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
-            Playlist playlist = invocationOnMock.getArgument(0);
+            Playlist playlist = invocationOnMock.getArgumentAt(0, Playlist.class);
             playlist.setId(id);
             return null;
         }
@@ -200,7 +199,7 @@ public class PlaylistServiceTestImport {
 
         @Override
         public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
-            File file = invocationOnMock.getArgument(0);
+            File file = invocationOnMock.getArgumentAt(0, File.class);
             MediaFile mediaFile = new MediaFile();
             mediaFile.setPath(file.getPath());
             return mediaFile;