From ef4d606db2657176ff9240072d9c264402317e40 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 17 Feb 2018 20:36:19 +0100 Subject: [PATCH] Move all converters to domain package. Signed-off-by: Yahor Berdnikau --- .../ultrasonic/service/RESTMusicService.java | 30 +++++++++---------- .../{data => domain}/APIAlbumConverter.kt | 3 +- .../{data => domain}/APIArtistConverter.kt | 4 +-- .../{data => domain}/APIBookmarkConverter.kt | 3 +- .../APIChatMessageConverter.kt | 3 +- .../{data => domain}/APIGenreConverter.kt | 3 +- .../{data => domain}/APIIndexesConverter.kt | 4 +-- .../{data => domain}/APIJukeboxCoverter.kt | 3 +- .../{data => domain}/APILyricsConverter.kt | 3 +- .../APIMusicDirectoryConverter.kt | 3 +- .../APIMusicFolderConverter.kt | 3 +- .../{data => domain}/APIPlaylistConverter.kt | 4 +-- .../{data => domain}/APIPodcastConverter.kt | 3 +- .../{data => domain}/APISearchConverter.kt | 3 +- .../{data => domain}/APIShareConverter.kt | 3 +- .../{data => domain}/APIUserConverter.kt | 3 +- .../{data => domain}/APIAlbumConverterTest.kt | 2 +- .../APIArtistConverterTest.kt | 2 +- .../APIBookmarkConverterTest.kt | 2 +- .../APIChatMessageConverterTest.kt | 2 +- .../APIIndexesConverterTest.kt | 2 +- .../APIJukeboxConverterTest.kt | 2 +- .../APILyricsConverterTest.kt | 2 +- .../APIMusicDirectoryConverterTest.kt | 2 +- .../APIMusicFolderConverterTest.kt | 2 +- .../APIPlaylistConverterTest.kt | 2 +- .../APIPodcastConverterTest.kt | 2 +- .../APISearchConverterTest.kt | 2 +- .../{data => domain}/APIShareConverterTest.kt | 2 +- .../{data => domain}/APIUserConverterTest.kt | 2 +- .../{data => domain}/ApiGenreConverterTest.kt | 2 +- 31 files changed, 45 insertions(+), 63 deletions(-) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIAlbumConverter.kt (92%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIArtistConverter.kt (81%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIBookmarkConverter.kt (89%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIChatMessageConverter.kt (86%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIGenreConverter.kt (84%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIIndexesConverter.kt (83%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIJukeboxCoverter.kt (85%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APILyricsConverter.kt (83%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIMusicDirectoryConverter.kt (96%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIMusicFolderConverter.kt (84%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIPlaylistConverter.kt (87%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIPodcastConverter.kt (84%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APISearchConverter.kt (92%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIShareConverter.kt (93%) rename ultrasonic/src/main/kotlin/org/moire/ultrasonic/{data => domain}/APIUserConverter.kt (92%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIAlbumConverterTest.kt (98%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIArtistConverterTest.kt (97%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIBookmarkConverterTest.kt (97%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIChatMessageConverterTest.kt (96%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIIndexesConverterTest.kt (97%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIJukeboxConverterTest.kt (95%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APILyricsConverterTest.kt (94%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIMusicDirectoryConverterTest.kt (99%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIMusicFolderConverterTest.kt (97%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIPlaylistConverterTest.kt (98%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIPodcastConverterTest.kt (97%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APISearchConverterTest.kt (98%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIShareConverterTest.kt (98%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/APIUserConverterTest.kt (97%) rename ultrasonic/src/test/kotlin/org/moire/ultrasonic/{data => domain}/ApiGenreConverterTest.kt (96%) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java index 43b7c9e7..a4129f52 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java @@ -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.SubsonicResponse; import org.moire.ultrasonic.api.subsonic.response.VideosResponse; -import org.moire.ultrasonic.data.APIAlbumConverter; -import org.moire.ultrasonic.data.APIArtistConverter; -import org.moire.ultrasonic.data.APIBookmarkConverter; -import org.moire.ultrasonic.data.APIChatMessageConverter; -import org.moire.ultrasonic.data.APIIndexesConverter; -import org.moire.ultrasonic.data.APIJukeboxConverter; -import org.moire.ultrasonic.data.APILyricsConverter; -import org.moire.ultrasonic.data.APIMusicDirectoryConverter; -import org.moire.ultrasonic.data.APIMusicFolderConverter; -import org.moire.ultrasonic.data.APIPlaylistConverter; -import org.moire.ultrasonic.data.APIPodcastConverter; -import org.moire.ultrasonic.data.APISearchConverter; -import org.moire.ultrasonic.data.APIShareConverter; -import org.moire.ultrasonic.data.APIUserConverter; -import org.moire.ultrasonic.data.ApiGenreConverter; +import org.moire.ultrasonic.domain.APIAlbumConverter; +import org.moire.ultrasonic.domain.APIArtistConverter; +import org.moire.ultrasonic.domain.APIBookmarkConverter; +import org.moire.ultrasonic.domain.APIChatMessageConverter; +import org.moire.ultrasonic.domain.APIIndexesConverter; +import org.moire.ultrasonic.domain.APIJukeboxConverter; +import org.moire.ultrasonic.domain.APILyricsConverter; +import org.moire.ultrasonic.domain.APIMusicDirectoryConverter; +import org.moire.ultrasonic.domain.APIMusicFolderConverter; +import org.moire.ultrasonic.domain.APIPlaylistConverter; +import org.moire.ultrasonic.domain.APIPodcastConverter; +import org.moire.ultrasonic.domain.APISearchConverter; +import org.moire.ultrasonic.domain.APIShareConverter; +import org.moire.ultrasonic.domain.APIUserConverter; +import org.moire.ultrasonic.domain.ApiGenreConverter; import org.moire.ultrasonic.domain.Bookmark; import org.moire.ultrasonic.domain.ChatMessage; import org.moire.ultrasonic.domain.Genre; diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIAlbumConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt similarity index 92% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIAlbumConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt index 482e7275..f5f6c4ac 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIAlbumConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt @@ -1,10 +1,9 @@ // Converts Album entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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.domain.MusicDirectory fun Album.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry().apply { id = this@toDomainEntity.id diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIArtistConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt similarity index 81% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIArtistConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt index 06e3f8ae..2a144b95 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIArtistConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt @@ -1,10 +1,8 @@ // Converts Artist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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 fun APIArtist.toDomainEntity(): Artist = Artist().apply { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIBookmarkConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverter.kt similarity index 89% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIBookmarkConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverter.kt index df9a127e..3bcc2eb9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIBookmarkConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverter.kt @@ -1,8 +1,7 @@ // Contains helper functions to convert api Bookmark entity to domain entity @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 fun ApiBookmark.toDomainEntity(): Bookmark = Bookmark().apply { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIChatMessageConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt similarity index 86% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIChatMessageConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt index 96119075..64905c9d 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIChatMessageConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt @@ -1,8 +1,7 @@ // Contains helper functions to convert from api ChatMessage entity to domain entity @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 fun ApiChatMessage.toDomainEntity(): ChatMessage = ChatMessage().apply { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIGenreConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt similarity index 84% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIGenreConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt index 78607ec3..3719db7a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIGenreConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt @@ -1,8 +1,7 @@ // Collection of functions to convert api Genre entity to domain entity @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 fun APIGenre.toDomainEntity(): Genre = Genre().apply { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIIndexesConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIIndexesConverter.kt similarity index 83% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIIndexesConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIIndexesConverter.kt index 58aa2995..fbecc194 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIIndexesConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIIndexesConverter.kt @@ -1,11 +1,9 @@ // Converts Indexes entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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.domain.Artist -import org.moire.ultrasonic.domain.Indexes import org.moire.ultrasonic.api.subsonic.models.Indexes as APIIndexes fun APIIndexes.toDomainEntity(): Indexes = Indexes(this.lastModified, this.ignoredArticles, diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIJukeboxCoverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt similarity index 85% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIJukeboxCoverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt index bb4fe9a1..d1540610 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIJukeboxCoverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt @@ -1,8 +1,7 @@ // Collection of function to convert subsonic api jukebox responses to app entities @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 fun ApiJukeboxStatus.toDomainEntity(): JukeboxStatus = JukeboxStatus().apply { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APILyricsConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt similarity index 83% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APILyricsConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt index 8571dc01..8250dc21 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APILyricsConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt @@ -1,9 +1,8 @@ // Converts Lyrics entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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 fun APILyrics.toDomainEntity(): Lyrics = Lyrics().apply { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIMusicDirectoryConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt similarity index 96% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIMusicDirectoryConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt index 1ef56d4a..f20c8c02 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIMusicDirectoryConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt @@ -1,10 +1,9 @@ // Converts MusicDirectory entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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.domain.MusicDirectory import java.text.DateFormat import java.text.SimpleDateFormat import java.util.Locale diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIMusicFolderConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt similarity index 84% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIMusicFolderConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt index f7c5ebb6..c29e5e17 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIMusicFolderConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt @@ -1,9 +1,8 @@ // Converts MusicFolder entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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 fun APIMusicFolder.toDomainEntity(): MusicFolder = MusicFolder(this.id, this.name) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPlaylistConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt similarity index 87% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPlaylistConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt index a096fca1..8b7ef751 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPlaylistConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt @@ -1,10 +1,8 @@ // Converts Playlist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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 kotlin.LazyThreadSafetyMode.NONE import org.moire.ultrasonic.api.subsonic.models.Playlist as APIPlaylist diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPodcastConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt similarity index 84% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPodcastConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt index 3a5d3e4b..8aef5006 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPodcastConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt @@ -1,10 +1,9 @@ // Converts podcasts entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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.domain.PodcastsChannel fun PodcastChannel.toDomainEntity(): PodcastsChannel = PodcastsChannel( this.id, this.title, this.url, this.description, this.status) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APISearchConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt similarity index 92% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APISearchConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt index 7a1dafc0..abc96b7f 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APISearchConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt @@ -1,11 +1,10 @@ // Converts SearchResult entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @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.SearchTwoResult -import org.moire.ultrasonic.domain.SearchResult import org.moire.ultrasonic.api.subsonic.models.SearchResult as APISearchResult fun APISearchResult.toDomainEntity(): SearchResult = SearchResult(emptyList(), emptyList(), diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIShareConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt similarity index 93% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIShareConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt index a1933281..53725bda 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIShareConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt @@ -1,8 +1,7 @@ // Contains helper method to convert subsonic api share to domain model @file:JvmName("APIShareConverter") -package org.moire.ultrasonic.data +package org.moire.ultrasonic.domain -import org.moire.ultrasonic.domain.Share import java.text.SimpleDateFormat import kotlin.LazyThreadSafetyMode.NONE import org.moire.ultrasonic.api.subsonic.models.Share as APIShare diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIUserConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt similarity index 92% rename from ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIUserConverter.kt rename to ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt index 30fd036f..987f22ce 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIUserConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt @@ -1,8 +1,7 @@ // Helper functions to convert User entity to domain entity @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 fun User.toDomainEntity(): UserInfo = UserInfo().apply { diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIAlbumConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIAlbumConverterTest.kt similarity index 98% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIAlbumConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIAlbumConverterTest.kt index c75aba42..6d027b95 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIAlbumConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIAlbumConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIArtistConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIArtistConverterTest.kt similarity index 97% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIArtistConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIArtistConverterTest.kt index ec1928bf..c2a48340 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIArtistConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIArtistConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIBookmarkConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverterTest.kt similarity index 97% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIBookmarkConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverterTest.kt index 77a6052d..ce30d2ae 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIBookmarkConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIChatMessageConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverterTest.kt similarity index 96% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIChatMessageConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverterTest.kt index fc213ca5..aa1f41cd 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIChatMessageConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIIndexesConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIIndexesConverterTest.kt similarity index 97% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIIndexesConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIIndexesConverterTest.kt index 2778b926..d51522a4 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIIndexesConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIIndexesConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIJukeboxConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIJukeboxConverterTest.kt similarity index 95% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIJukeboxConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIJukeboxConverterTest.kt index 846970a6..11b3ff9d 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIJukeboxConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIJukeboxConverterTest.kt @@ -1,6 +1,6 @@ @file:Suppress("IllegalIdentifier") -package org.moire.ultrasonic.data +package org.moire.ultrasonic.domain import org.amshove.kluent.`should equal to` import org.junit.Test diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APILyricsConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APILyricsConverterTest.kt similarity index 94% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APILyricsConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APILyricsConverterTest.kt index 4ea41427..07a5260a 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APILyricsConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APILyricsConverterTest.kt @@ -1,6 +1,6 @@ @file:Suppress("IllegalIdentifier") -package org.moire.ultrasonic.data +package org.moire.ultrasonic.domain import org.amshove.kluent.`should equal to` import org.junit.Test diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIMusicDirectoryConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverterTest.kt similarity index 99% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIMusicDirectoryConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverterTest.kt index 4d8cdd73..0e89cdbf 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIMusicDirectoryConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIMusicFolderConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverterTest.kt similarity index 97% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIMusicFolderConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverterTest.kt index 34b1008c..7c66d464 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIMusicFolderConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverterTest.kt @@ -1,6 +1,6 @@ @file:Suppress("IllegalIdentifier") -package org.moire.ultrasonic.data +package org.moire.ultrasonic.domain import org.amshove.kluent.`should equal to` import org.junit.Test diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPlaylistConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverterTest.kt similarity index 98% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPlaylistConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverterTest.kt index 4ef73d00..6179f7cc 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPlaylistConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPodcastConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPodcastConverterTest.kt similarity index 97% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPodcastConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPodcastConverterTest.kt index 11958239..86ec2b4f 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPodcastConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPodcastConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APISearchConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APISearchConverterTest.kt similarity index 98% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APISearchConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APISearchConverterTest.kt index d83bed50..5e3ce2cf 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APISearchConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APISearchConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIShareConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIShareConverterTest.kt similarity index 98% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIShareConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIShareConverterTest.kt index 192b50b2..fc030018 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIShareConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIShareConverterTest.kt @@ -1,6 +1,6 @@ @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` diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIUserConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIUserConverterTest.kt similarity index 97% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIUserConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIUserConverterTest.kt index 4b5f2eb7..c071d073 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIUserConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIUserConverterTest.kt @@ -1,6 +1,6 @@ @file:Suppress("IllegalIdentifier") -package org.moire.ultrasonic.data +package org.moire.ultrasonic.domain import org.amshove.kluent.`should equal to` import org.junit.Test diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/ApiGenreConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/ApiGenreConverterTest.kt similarity index 96% rename from ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/ApiGenreConverterTest.kt rename to ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/ApiGenreConverterTest.kt index bf7dc9eb..a1d79b64 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/ApiGenreConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/ApiGenreConverterTest.kt @@ -1,6 +1,6 @@ @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`