Made dao and service use repository and service annotations so they can
get autowired and component scanned and don't have to be completely configured in applicationContext-service.xml Signed-off-by: Derrek Bond <yoyo007@gmail.com>
This commit is contained in:
yoyo007
@@ -10,253 +10,22 @@
|
||||
<import resource="applicationContext-db.xml" />
|
||||
|
||||
<!-- DAO's -->
|
||||
|
||||
<bean id="playerDao" class="org.airsonic.player.dao.PlayerDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="mediaFileDao" class="org.airsonic.player.dao.MediaFileDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="artistDao" class="org.airsonic.player.dao.ArtistDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="albumDao" class="org.airsonic.player.dao.AlbumDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="playlistDao" class="org.airsonic.player.dao.PlaylistDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="playQueueDao" class="org.airsonic.player.dao.PlayQueueDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="internetRadioDao" class="org.airsonic.player.dao.InternetRadioDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="musicFileInfoDao" class="org.airsonic.player.dao.RatingDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="musicFolderDao" class="org.airsonic.player.dao.MusicFolderDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
<property name="userDao" ref="userDao" />
|
||||
</bean>
|
||||
|
||||
<bean id="userDao" class="org.airsonic.player.dao.UserDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
<property name="userTableQuote" ref="userTableQuote"/>
|
||||
</bean>
|
||||
|
||||
<bean id="transcodingDao" class="org.airsonic.player.dao.TranscodingDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="podcastDao" class="org.airsonic.player.dao.PodcastDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="avatarDao" class="org.airsonic.player.dao.AvatarDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="shareDao" class="org.airsonic.player.dao.ShareDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<bean id="bookmarkDao" class="org.airsonic.player.dao.BookmarkDao">
|
||||
<property name="daoHelper" ref="daoHelper"/>
|
||||
</bean>
|
||||
|
||||
<context:component-scan base-package="org.airsonic.player.dao" />
|
||||
|
||||
<!-- Services -->
|
||||
|
||||
<bean id="mediaFileService" class="org.airsonic.player.service.MediaFileService">
|
||||
<property name="securityService" ref="securityService"/>
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="mediaFileMemoryCache" ref="mediaFileMemoryCache"/>
|
||||
<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">
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="userDao" ref="userDao"/>
|
||||
<property name="userCache" ref="userCache"/>
|
||||
</bean>
|
||||
|
||||
<bean id="configurationService" class="org.airsonic.player.service.ApacheCommonsConfigurationService" />
|
||||
|
||||
<bean id="metricsManager" class="org.airsonic.player.monitor.MetricsManager">
|
||||
<property name="configurationService" ref="configurationService" />
|
||||
</bean>
|
||||
|
||||
<bean id="settingsService" class="org.airsonic.player.service.SettingsService" init-method="init">
|
||||
<property name="internetRadioDao" ref="internetRadioDao"/>
|
||||
<property name="musicFolderDao" ref="musicFolderDao"/>
|
||||
<property name="userDao" ref="userDao"/>
|
||||
<property name="avatarDao" ref="avatarDao"/>
|
||||
<property name="configurationService" ref="configurationService" />
|
||||
</bean>
|
||||
|
||||
<bean id="mediaScannerService" class="org.airsonic.player.service.MediaScannerService" init-method="init" depends-on="metaDataParserFactory">
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="mediaFileDao" ref="mediaFileDao"/>
|
||||
<property name="playlistService" ref="playlistService"/>
|
||||
<property name="artistDao" ref="artistDao"/>
|
||||
<property name="albumDao" ref="albumDao"/>
|
||||
<property name="searchService" ref="searchService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="searchService" class="org.airsonic.player.service.SearchService">
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="artistDao" ref="artistDao"/>
|
||||
<property name="albumDao" ref="albumDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="networkService" class="org.airsonic.player.service.NetworkService" />
|
||||
|
||||
<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"/>
|
||||
<property name="transcodingService" ref="transcodingService"/>
|
||||
</bean>
|
||||
|
||||
<context:component-scan base-package="org.airsonic.player.service.playlist" />
|
||||
|
||||
<!--suppress SpringBeanConstructorArgInspection, AutowiredDependenciesInspection -->
|
||||
<bean id="playlistService" class="org.airsonic.player.service.PlaylistService" autowire="constructor"/>
|
||||
|
||||
<bean id="versionService" class="org.airsonic.player.service.VersionService" />
|
||||
|
||||
<bean id="statusService" class="org.airsonic.player.service.StatusService">
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="ratingService" class="org.airsonic.player.service.RatingService">
|
||||
<property name="ratingDao" ref="musicFileInfoDao"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="securityService" ref="securityService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="musicIndexService" class="org.airsonic.player.service.MusicIndexService">
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="audioScrobblerService" class="org.airsonic.player.service.AudioScrobblerService">
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="transcodingService" class="org.airsonic.player.service.TranscodingService">
|
||||
<property name="transcodingDao" ref="transcodingDao"/>
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="playerService" ref="playerService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="shareService" class="org.airsonic.player.service.ShareService">
|
||||
<property name="shareDao" ref="shareDao"/>
|
||||
<property name="securityService" ref="securityService"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="jwtSecurityService" ref="jwtSecurityService" />
|
||||
</bean>
|
||||
|
||||
<bean id="podcastService" class="org.airsonic.player.service.PodcastService" init-method="init">
|
||||
<property name="podcastDao" ref="podcastDao"/>
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="securityService" ref="securityService"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="metaDataParserFactory" ref="metaDataParserFactory"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jukeboxService" class="org.airsonic.player.service.JukeboxService">
|
||||
<property name="statusService" ref="statusService"/>
|
||||
<property name="transcodingService" ref="transcodingService"/>
|
||||
<property name="audioScrobblerService" ref="audioScrobblerService"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="securityService" ref="securityService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="folderBasedContentDirectory" class="org.airsonic.player.service.upnp.FolderBasedContentDirectory">
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="playlistService" ref="playlistService"/>
|
||||
<property name="playerService" ref="playerService"/>
|
||||
<property name="transcodingService" ref="transcodingService"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="jwtSecurityService" ref="jwtSecurityService" />
|
||||
</bean>
|
||||
|
||||
<bean id="dispatchingContentDirectory" class="org.airsonic.player.service.upnp.DispatchingContentDirectory">
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="playlistService" ref="playlistService"/>
|
||||
<property name="playerService" ref="playerService"/>
|
||||
<property name="transcodingService" ref="transcodingService"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="jwtSecurityService" ref="jwtSecurityService" />
|
||||
<property name="albumProcessor" ref="albumUpnpProcessor" />
|
||||
<property name="recentAlbumProcessor" ref="recentAlbumUpnpProcessor" />
|
||||
</bean>
|
||||
|
||||
<bean id="mediaFileUpnpProcessor" class="org.airsonic.player.service.upnp.MediaFileUpnpProcessor"/>
|
||||
<bean id="playlistUpnpProcessor" class="org.airsonic.player.service.upnp.PlaylistUpnpProcessor"/>
|
||||
<bean id="rootUpnpProcessor" class="org.airsonic.player.service.upnp.RootUpnpProcessor"/>
|
||||
<bean id="artistUpnpProcessor" class="org.airsonic.player.service.upnp.ArtistUpnpProcessor"/>
|
||||
<bean id="albumUpnpProcessor" class="org.airsonic.player.service.upnp.AlbumUpnpProcessor"/>
|
||||
<bean id="recentAlbumUpnpProcessor" class="org.airsonic.player.service.upnp.RecentAlbumUpnpProcessor"/>
|
||||
<bean id="genreUpnpProcessor" class="org.airsonic.player.service.upnp.GenreUpnpProcessor"/>
|
||||
|
||||
<bean id="upnpService" class="org.airsonic.player.service.UPnPService" init-method="init">
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="customContentDirectory" ref="dispatchingContentDirectory"/>
|
||||
</bean>
|
||||
|
||||
<bean id="lastFmService" class="org.airsonic.player.service.LastFmService" init-method="init">
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="mediaFileDao" ref="mediaFileDao"/>
|
||||
<property name="artistDao" ref="artistDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="sonosService" class="org.airsonic.player.service.SonosService">
|
||||
<property name="sonosHelper" ref="sonosHelper"/>
|
||||
<property name="mediaFileService" ref="mediaFileService"/>
|
||||
<property name="securityService" ref="securityService"/>
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
<property name="playlistService" ref="playlistService"/>
|
||||
<property name="upnpService" ref="upnpService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jaudiotaggerParser" class="org.airsonic.player.service.metadata.JaudiotaggerParser">
|
||||
<constructor-arg name="settingsService" ref="settingsService" />
|
||||
</bean>
|
||||
|
||||
<context:component-scan base-package="org.airsonic.player.service" />
|
||||
<bean id="metaDataParserFactory" class="org.airsonic.player.service.metadata.MetaDataParserFactory">
|
||||
<property name="parsers">
|
||||
<list>
|
||||
<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>
|
||||
<ref bean="jaudiotaggerParser" />
|
||||
<ref bean="ffmpegParser" />
|
||||
<ref bean="defaultMetaDataParser" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="metricsManager" class="org.airsonic.player.monitor.MetricsManager"></bean>
|
||||
|
||||
<!-- AJAX services -->
|
||||
|
||||
@@ -326,8 +95,5 @@
|
||||
<property name="settingsService" ref="settingsService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="jwtSecurityService" class="org.airsonic.player.service.JWTSecurityService">
|
||||
<constructor-arg ref="settingsService" />
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
||||
Reference in New Issue
Block a user