1
0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-03-10 16:40:19 +01:00

Move all converters to domain package.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2018-02-17 20:36:19 +01:00
parent 6951f653bd
commit ef4d606db2
31 changed files with 45 additions and 63 deletions

View File

@ -61,21 +61,21 @@ import org.moire.ultrasonic.api.subsonic.response.SharesResponse;
import org.moire.ultrasonic.api.subsonic.response.StreamResponse; import org.moire.ultrasonic.api.subsonic.response.StreamResponse;
import org.moire.ultrasonic.api.subsonic.response.SubsonicResponse; import org.moire.ultrasonic.api.subsonic.response.SubsonicResponse;
import org.moire.ultrasonic.api.subsonic.response.VideosResponse; import org.moire.ultrasonic.api.subsonic.response.VideosResponse;
import org.moire.ultrasonic.data.APIAlbumConverter; import org.moire.ultrasonic.domain.APIAlbumConverter;
import org.moire.ultrasonic.data.APIArtistConverter; import org.moire.ultrasonic.domain.APIArtistConverter;
import org.moire.ultrasonic.data.APIBookmarkConverter; import org.moire.ultrasonic.domain.APIBookmarkConverter;
import org.moire.ultrasonic.data.APIChatMessageConverter; import org.moire.ultrasonic.domain.APIChatMessageConverter;
import org.moire.ultrasonic.data.APIIndexesConverter; import org.moire.ultrasonic.domain.APIIndexesConverter;
import org.moire.ultrasonic.data.APIJukeboxConverter; import org.moire.ultrasonic.domain.APIJukeboxConverter;
import org.moire.ultrasonic.data.APILyricsConverter; import org.moire.ultrasonic.domain.APILyricsConverter;
import org.moire.ultrasonic.data.APIMusicDirectoryConverter; import org.moire.ultrasonic.domain.APIMusicDirectoryConverter;
import org.moire.ultrasonic.data.APIMusicFolderConverter; import org.moire.ultrasonic.domain.APIMusicFolderConverter;
import org.moire.ultrasonic.data.APIPlaylistConverter; import org.moire.ultrasonic.domain.APIPlaylistConverter;
import org.moire.ultrasonic.data.APIPodcastConverter; import org.moire.ultrasonic.domain.APIPodcastConverter;
import org.moire.ultrasonic.data.APISearchConverter; import org.moire.ultrasonic.domain.APISearchConverter;
import org.moire.ultrasonic.data.APIShareConverter; import org.moire.ultrasonic.domain.APIShareConverter;
import org.moire.ultrasonic.data.APIUserConverter; import org.moire.ultrasonic.domain.APIUserConverter;
import org.moire.ultrasonic.data.ApiGenreConverter; import org.moire.ultrasonic.domain.ApiGenreConverter;
import org.moire.ultrasonic.domain.Bookmark; import org.moire.ultrasonic.domain.Bookmark;
import org.moire.ultrasonic.domain.ChatMessage; import org.moire.ultrasonic.domain.ChatMessage;
import org.moire.ultrasonic.domain.Genre; import org.moire.ultrasonic.domain.Genre;

View File

@ -1,10 +1,9 @@
// Converts Album entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts Album entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APIAlbumConverter") @file:JvmName("APIAlbumConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.api.subsonic.models.Album import org.moire.ultrasonic.api.subsonic.models.Album
import org.moire.ultrasonic.domain.MusicDirectory
fun Album.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry().apply { fun Album.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry().apply {
id = this@toDomainEntity.id id = this@toDomainEntity.id

View File

@ -1,10 +1,8 @@
// Converts Artist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts Artist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APIArtistConverter") @file:JvmName("APIArtistConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.Artist
import org.moire.ultrasonic.domain.MusicDirectory
import org.moire.ultrasonic.api.subsonic.models.Artist as APIArtist import org.moire.ultrasonic.api.subsonic.models.Artist as APIArtist
fun APIArtist.toDomainEntity(): Artist = Artist().apply { fun APIArtist.toDomainEntity(): Artist = Artist().apply {

View File

@ -1,8 +1,7 @@
// Contains helper functions to convert api Bookmark entity to domain entity // Contains helper functions to convert api Bookmark entity to domain entity
@file:JvmName("APIBookmarkConverter") @file:JvmName("APIBookmarkConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.Bookmark
import org.moire.ultrasonic.api.subsonic.models.Bookmark as ApiBookmark import org.moire.ultrasonic.api.subsonic.models.Bookmark as ApiBookmark
fun ApiBookmark.toDomainEntity(): Bookmark = Bookmark().apply { fun ApiBookmark.toDomainEntity(): Bookmark = Bookmark().apply {

View File

@ -1,8 +1,7 @@
// Contains helper functions to convert from api ChatMessage entity to domain entity // Contains helper functions to convert from api ChatMessage entity to domain entity
@file:JvmName("APIChatMessageConverter") @file:JvmName("APIChatMessageConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.ChatMessage
import org.moire.ultrasonic.api.subsonic.models.ChatMessage as ApiChatMessage import org.moire.ultrasonic.api.subsonic.models.ChatMessage as ApiChatMessage
fun ApiChatMessage.toDomainEntity(): ChatMessage = ChatMessage().apply { fun ApiChatMessage.toDomainEntity(): ChatMessage = ChatMessage().apply {

View File

@ -1,8 +1,7 @@
// Collection of functions to convert api Genre entity to domain entity // Collection of functions to convert api Genre entity to domain entity
@file:JvmName("ApiGenreConverter") @file:JvmName("ApiGenreConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.Genre
import org.moire.ultrasonic.api.subsonic.models.Genre as APIGenre import org.moire.ultrasonic.api.subsonic.models.Genre as APIGenre
fun APIGenre.toDomainEntity(): Genre = Genre().apply { fun APIGenre.toDomainEntity(): Genre = Genre().apply {

View File

@ -1,11 +1,9 @@
// Converts Indexes entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts Indexes entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APIIndexesConverter") @file:JvmName("APIIndexesConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.api.subsonic.models.Index import org.moire.ultrasonic.api.subsonic.models.Index
import org.moire.ultrasonic.domain.Artist
import org.moire.ultrasonic.domain.Indexes
import org.moire.ultrasonic.api.subsonic.models.Indexes as APIIndexes import org.moire.ultrasonic.api.subsonic.models.Indexes as APIIndexes
fun APIIndexes.toDomainEntity(): Indexes = Indexes(this.lastModified, this.ignoredArticles, fun APIIndexes.toDomainEntity(): Indexes = Indexes(this.lastModified, this.ignoredArticles,

View File

@ -1,8 +1,7 @@
// Collection of function to convert subsonic api jukebox responses to app entities // Collection of function to convert subsonic api jukebox responses to app entities
@file:JvmName("APIJukeboxConverter") @file:JvmName("APIJukeboxConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.JukeboxStatus
import org.moire.ultrasonic.api.subsonic.models.JukeboxStatus as ApiJukeboxStatus import org.moire.ultrasonic.api.subsonic.models.JukeboxStatus as ApiJukeboxStatus
fun ApiJukeboxStatus.toDomainEntity(): JukeboxStatus = JukeboxStatus().apply { fun ApiJukeboxStatus.toDomainEntity(): JukeboxStatus = JukeboxStatus().apply {

View File

@ -1,9 +1,8 @@
// Converts Lyrics entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts Lyrics entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APILyricsConverter") @file:JvmName("APILyricsConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.Lyrics
import org.moire.ultrasonic.api.subsonic.models.Lyrics as APILyrics import org.moire.ultrasonic.api.subsonic.models.Lyrics as APILyrics
fun APILyrics.toDomainEntity(): Lyrics = Lyrics().apply { fun APILyrics.toDomainEntity(): Lyrics = Lyrics().apply {

View File

@ -1,10 +1,9 @@
// Converts MusicDirectory entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts MusicDirectory entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APIMusicDirectoryConverter") @file:JvmName("APIMusicDirectoryConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.api.subsonic.models.MusicDirectoryChild import org.moire.ultrasonic.api.subsonic.models.MusicDirectoryChild
import org.moire.ultrasonic.domain.MusicDirectory
import java.text.DateFormat import java.text.DateFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale

View File

@ -1,9 +1,8 @@
// Converts MusicFolder entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts MusicFolder entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APIMusicFolderConverter") @file:JvmName("APIMusicFolderConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.MusicFolder
import org.moire.ultrasonic.api.subsonic.models.MusicFolder as APIMusicFolder import org.moire.ultrasonic.api.subsonic.models.MusicFolder as APIMusicFolder
fun APIMusicFolder.toDomainEntity(): MusicFolder = MusicFolder(this.id, this.name) fun APIMusicFolder.toDomainEntity(): MusicFolder = MusicFolder(this.id, this.name)

View File

@ -1,10 +1,8 @@
// Converts Playlist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts Playlist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APIPlaylistConverter") @file:JvmName("APIPlaylistConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.MusicDirectory
import org.moire.ultrasonic.domain.Playlist
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import kotlin.LazyThreadSafetyMode.NONE import kotlin.LazyThreadSafetyMode.NONE
import org.moire.ultrasonic.api.subsonic.models.Playlist as APIPlaylist import org.moire.ultrasonic.api.subsonic.models.Playlist as APIPlaylist

View File

@ -1,10 +1,9 @@
// Converts podcasts entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts podcasts entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APIPodcastConverter") @file:JvmName("APIPodcastConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.api.subsonic.models.PodcastChannel import org.moire.ultrasonic.api.subsonic.models.PodcastChannel
import org.moire.ultrasonic.domain.PodcastsChannel
fun PodcastChannel.toDomainEntity(): PodcastsChannel = PodcastsChannel( fun PodcastChannel.toDomainEntity(): PodcastsChannel = PodcastsChannel(
this.id, this.title, this.url, this.description, this.status) this.id, this.title, this.url, this.description, this.status)

View File

@ -1,11 +1,10 @@
// Converts SearchResult entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // Converts SearchResult entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient]
// to app domain entities. // to app domain entities.
@file:JvmName("APISearchConverter") @file:JvmName("APISearchConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.api.subsonic.models.SearchThreeResult import org.moire.ultrasonic.api.subsonic.models.SearchThreeResult
import org.moire.ultrasonic.api.subsonic.models.SearchTwoResult import org.moire.ultrasonic.api.subsonic.models.SearchTwoResult
import org.moire.ultrasonic.domain.SearchResult
import org.moire.ultrasonic.api.subsonic.models.SearchResult as APISearchResult import org.moire.ultrasonic.api.subsonic.models.SearchResult as APISearchResult
fun APISearchResult.toDomainEntity(): SearchResult = SearchResult(emptyList(), emptyList(), fun APISearchResult.toDomainEntity(): SearchResult = SearchResult(emptyList(), emptyList(),

View File

@ -1,8 +1,7 @@
// Contains helper method to convert subsonic api share to domain model // Contains helper method to convert subsonic api share to domain model
@file:JvmName("APIShareConverter") @file:JvmName("APIShareConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.Share
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import kotlin.LazyThreadSafetyMode.NONE import kotlin.LazyThreadSafetyMode.NONE
import org.moire.ultrasonic.api.subsonic.models.Share as APIShare import org.moire.ultrasonic.api.subsonic.models.Share as APIShare

View File

@ -1,8 +1,7 @@
// Helper functions to convert User entity to domain entity // Helper functions to convert User entity to domain entity
@file:JvmName("APIUserConverter") @file:JvmName("APIUserConverter")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.moire.ultrasonic.domain.UserInfo
import org.moire.ultrasonic.api.subsonic.models.User import org.moire.ultrasonic.api.subsonic.models.User
fun User.toDomainEntity(): UserInfo = UserInfo().apply { fun User.toDomainEntity(): UserInfo = UserInfo().apply {

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.junit.Test import org.junit.Test

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.junit.Test import org.junit.Test

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.junit.Test import org.junit.Test

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.junit.Test import org.junit.Test

View File

@ -1,6 +1,6 @@
@file:Suppress("IllegalIdentifier") @file:Suppress("IllegalIdentifier")
package org.moire.ultrasonic.data package org.moire.ultrasonic.domain
import org.amshove.kluent.`should equal to` import org.amshove.kluent.`should equal to`
import org.amshove.kluent.`should equal` import org.amshove.kluent.`should equal`