MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor to remove serviceLocator

Browse Source 
- This removes all dependencies on deprecated ServiceLocator class.
- Also does some cleanup in the settingsService

Signed-off-by: Ben Kelsey <bfkelsey@gmail.com>
This commit is contained in:
Ben Kelsey
2017-08-12 18:22:05 -07:00
parent bd9c793500
commit 977499c4cc
10 changed files with 87 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/resources/applicationContext-service.xml
+12 -2
View File
@@ -82,6 +82,7 @@
<property name="mediaFileDao" ref="mediaFileDao"/>
<property name="albumDao" ref="albumDao"/>
<property name="metaDataParserFactory" ref="metaDataParserFactory"/>
<property name="parser" ref="jaudiotaggerParser" />
</bean>
<bean id="securityService" class="org.airsonic.player.service.SecurityService">
@@ -233,14 +234,23 @@
<property name="upnpService" ref="upnpService"/>
</bean>
<bean id="jaudiotaggerParser" class="org.airsonic.player.service.metadata.JaudiotaggerParser">
<constructor-arg name="settingsService" ref="settingsService" />
</bean>
<bean id="metaDataParserFactory" class="org.airsonic.player.service.metadata.MetaDataParserFactory">
<property name="parsers">
<list>
<bean class="org.airsonic.player.service.metadata.JaudiotaggerParser"/>
<bean class="org.airsonic.player.service.metadata.JaudiotaggerParser">
<constructor-arg name="settingsService" ref="settingsService" />
</bean>
<bean class="org.airsonic.player.service.metadata.FFmpegParser">
<property name="transcodingService" ref="transcodingService"/>
<property name="settingsService" ref="settingsService" />
</bean>
<bean class="org.airsonic.player.service.metadata.DefaultMetaDataParser">
<constructor-arg name="settingsService" ref="settingsService" />
</bean>
<bean class="org.airsonic.player.service.metadata.DefaultMetaDataParser"/>
</list>
</property>
</bean>