diff --git a/src/main/java/io/github/yvasyliev/deezer/service/DeezerService.java b/src/main/java/io/github/yvasyliev/deezer/service/DeezerService.java index 399aa4e..e66a80c 100644 --- a/src/main/java/io/github/yvasyliev/deezer/service/DeezerService.java +++ b/src/main/java/io/github/yvasyliev/deezer/service/DeezerService.java @@ -2,4 +2,5 @@ public interface DeezerService { String GET = "GET "; + String POST = "POST "; } diff --git a/src/main/java/io/github/yvasyliev/deezer/service/UserService.java b/src/main/java/io/github/yvasyliev/deezer/service/UserService.java new file mode 100644 index 0000000..fb9a6df --- /dev/null +++ b/src/main/java/io/github/yvasyliev/deezer/service/UserService.java @@ -0,0 +1,114 @@ +package io.github.yvasyliev.deezer.service; + +import api.deezer.objects.GetPermissionsResponse; +import feign.Param; +import feign.QueryMap; +import feign.RequestLine; +import io.github.yvasyliev.deezer.objects.Album; +import io.github.yvasyliev.deezer.objects.Artist; +import io.github.yvasyliev.deezer.objects.Playlist; +import io.github.yvasyliev.deezer.objects.Track; +import io.github.yvasyliev.deezer.objects.User; +import io.github.yvasyliev.deezer.v2.methods.PagingMethod; +import io.github.yvasyliev.deezer.v2.objects.Page; + +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +public interface UserService extends DeezerService { + String USER = "/user/{userId}"; + String USER_ALBUMS = "/user/{userId}/albums"; + String USER_ARTISTS = "/user/{userId}/artist"; + String USER_CHART = "/user/{userId}/charts"; + String USER_ALBUM_CHART = "/user/{userId}/charts/albums"; + String USER_ARTIST_CHART = "/user/{userId}/charts/artists"; + String USER_PLAYLIST_CHART = "/user/{userId}/charts/playlists"; + String USER_TRACK_CHART = "/user/{userId}/charts/tracks"; + String USER_FLOW = "/user/{userId}/flow"; + String USER_FOLLOWINGS = "/user/{userId}/followings"; + String USER_FOLLOWERS = "/user/{userId}/followers"; + String USER_HISTORY = "/user/{userId}/history"; + String USER_NOTIFICATIONS = "/user/{userId}/notifications"; + String USER_PERMISSIONS = "/user/{userId}/permissions"; + + @RequestLine(GET + USER) + User getUser(@Param("userId") long userId); + + @RequestLine(GET + USER) + CompletableFuture getUserAsync(@Param("userId") long userId); + + @RequestLine(GET + USER_ALBUMS) + Page> getUserAlbums(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_ALBUMS) + CompletableFuture>> getUserAlbumsAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_ARTISTS) + Page> getUserArtists(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_ARTISTS) + CompletableFuture>> getUserArtistsAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_CHART) + Page> getUserCharts(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_CHART) + CompletableFuture>> getUserChartsAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_ALBUM_CHART) + Page> getUserAlbumChart(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_ALBUM_CHART) + CompletableFuture>> getUserAlbumChartAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_ARTIST_CHART) + Page> getUserArtistChart(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_PLAYLIST_CHART) + Page> getUserPlaylistChart(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_PLAYLIST_CHART) + CompletableFuture>> getUserPlaylistChartAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_TRACK_CHART) + Page> getUserTrackChart(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_TRACK_CHART) + CompletableFuture>> getUserTracksChartAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_FLOW) + Page> getUserFlow(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_FLOW) + CompletableFuture>> getUserFlowAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_FOLLOWINGS) + Page> getUserFollowings(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_FOLLOWINGS) + CompletableFuture>> getUserFollowingsAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_FOLLOWERS) + Page> getUserFollowers(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_FOLLOWERS) + CompletableFuture>> getUserFollowersAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_HISTORY) + Page> getUserHistory(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_HISTORY) + CompletableFuture>> getUserHistoryAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(POST + USER_NOTIFICATIONS) + Boolean sendUserNotification(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(POST + USER_NOTIFICATIONS) + CompletableFuture sendUserNotificationAsync(@Param("userId") long userId, @QueryMap Map queryParams); + + @RequestLine(GET + USER_PERMISSIONS) + GetPermissionsResponse getUserPermissions(@Param("userId") long userId); + + @RequestLine(GET + USER_PERMISSIONS) + CompletableFuture getUserPermissionsAsync(@Param("userId") long userId); +} diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/DeezerClient.java b/src/main/java/io/github/yvasyliev/deezer/v2/DeezerClient.java index 16fde51..6d574bf 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/DeezerClient.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/DeezerClient.java @@ -2,6 +2,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializer; import com.google.gson.ToNumberPolicy; import feign.AsyncFeign; import feign.Logger; @@ -35,7 +36,6 @@ import io.github.yvasyliev.deezer.v2.json.creators.AdvancedSearchMethodCreator; import io.github.yvasyliev.deezer.v2.json.creators.PagingMethodCreator; import io.github.yvasyliev.deezer.v2.json.creators.SearchMethodCreator; -import io.github.yvasyliev.deezer.v2.json.deserializers.AbstractMethodDeserializer; import io.github.yvasyliev.deezer.v2.json.deserializers.AdvancedSearchMethodDeserializer; import io.github.yvasyliev.deezer.v2.json.deserializers.MethodDeserializer; import io.github.yvasyliev.deezer.v2.logger.DeezerLogger; @@ -100,6 +100,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.Setter; import java.time.Duration; import java.time.LocalDate; @@ -107,6 +108,7 @@ import java.util.stream.Stream; @AllArgsConstructor(access = AccessLevel.PRIVATE) +@Setter public class DeezerClient { private static final String API_HOST = "https://api.deezer.com"; private final Gson gson; @@ -137,8 +139,7 @@ private static DeezerClient create( Function, AsyncFeign.AsyncBuilder> asyncFeignBuilderCreator, String accessToken ) { - - AbstractMethodDeserializer> methodDeserializer = MethodDeserializer + JsonDeserializer> methodDeserializer = MethodDeserializer .builder() .classMap("/album/(\\d+)/fans", GetAlbumFans.class) .classMap("/album/(\\d+)/tracks", GetAlbumTracks.class) @@ -177,7 +178,7 @@ private static DeezerClient create( .classMap(SearchService.SEARCH_USER, SearchUser.class) .build(); - AbstractMethodDeserializer> advancedSearchMethodDeserializer = AdvancedSearchMethodDeserializer + JsonDeserializer> advancedSearchMethodDeserializer = AdvancedSearchMethodDeserializer .builder() .classMap(SearchService.SEARCH, AdvancedSearch.class) .classMap(SearchService.SEARCH_ALBUM, AdvancedSearchAlbum.class) diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ObjectServiceMethod.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractObjectServiceMethod.java similarity index 69% rename from src/main/java/io/github/yvasyliev/deezer/v2/methods/ObjectServiceMethod.java rename to src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractObjectServiceMethod.java index 06a6755..8f71c7e 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ObjectServiceMethod.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractObjectServiceMethod.java @@ -6,12 +6,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) -public abstract class ObjectServiceMethod extends ServiceMethod { +public abstract class AbstractObjectServiceMethod extends AbstractServiceMethod { @Expose @SerializedName(value = OBJECT_ID) protected final long objectId; - public ObjectServiceMethod(S deezerService, long objectId) { + public AbstractObjectServiceMethod(S deezerService, long objectId) { super(deezerService); this.objectId = objectId; } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ObjectServicePagingMethod.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractObjectServicePagingMethod.java similarity index 69% rename from src/main/java/io/github/yvasyliev/deezer/v2/methods/ObjectServicePagingMethod.java rename to src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractObjectServicePagingMethod.java index 4b2d741..d358845 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ObjectServicePagingMethod.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractObjectServicePagingMethod.java @@ -8,12 +8,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) -public abstract class ObjectServicePagingMethod extends ServicePagingMethod { +public abstract class AbstractObjectServicePagingMethod extends AbstractServicePagingMethod { @Expose(serialize = false) @SerializedName(value = OBJECT_ID) protected final long objectId; - public ObjectServicePagingMethod(Gson gson, S deezerService, long objectId) { + public AbstractObjectServicePagingMethod(Gson gson, S deezerService, long objectId) { super(gson, deezerService); this.objectId = objectId; } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ServiceMethod.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractServiceMethod.java similarity index 72% rename from src/main/java/io/github/yvasyliev/deezer/v2/methods/ServiceMethod.java rename to src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractServiceMethod.java index d95d644..357d206 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ServiceMethod.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractServiceMethod.java @@ -6,6 +6,6 @@ @AllArgsConstructor @EqualsAndHashCode -public abstract class ServiceMethod implements Method { +public abstract class AbstractServiceMethod implements Method { protected final S deezerService; } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ServicePagingMethod.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractServicePagingMethod.java similarity index 61% rename from src/main/java/io/github/yvasyliev/deezer/v2/methods/ServicePagingMethod.java rename to src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractServicePagingMethod.java index fbe7f0e..10a3cfd 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/ServicePagingMethod.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/AbstractServicePagingMethod.java @@ -4,10 +4,10 @@ import io.github.yvasyliev.deezer.objects.Pageable; import io.github.yvasyliev.deezer.service.DeezerService; -public abstract class ServicePagingMethod extends PagingMethod { +public abstract class AbstractServicePagingMethod extends PagingMethod { protected final S deezerService; - public ServicePagingMethod(Gson gson, S deezerService) { + public AbstractServicePagingMethod(Gson gson, S deezerService) { super(gson); this.deezerService = deezerService; } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbum.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbum.java index 90130f9..195afa8 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbum.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbum.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Album; import io.github.yvasyliev.deezer.service.AlbumService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetAlbum extends ObjectServiceMethod { +public class GetAlbum extends AbstractObjectServiceMethod { public GetAlbum(AlbumService albumService, long albumId) { super(albumService, albumId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumFans.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumFans.java index 164420f..4ac008d 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumFans.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumFans.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.User; import io.github.yvasyliev.deezer.service.AlbumService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetAlbumFans extends ObjectServicePagingMethod { +public class GetAlbumFans extends AbstractObjectServicePagingMethod { public GetAlbumFans(Gson gson, AlbumService albumService, long albumId) { super(gson, albumService, albumId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumTracks.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumTracks.java index 5455d5a..cb20c1c 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumTracks.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/album/GetAlbumTracks.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Track; import io.github.yvasyliev.deezer.service.AlbumService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetAlbumTracks extends ObjectServicePagingMethod { +public class GetAlbumTracks extends AbstractObjectServicePagingMethod { public GetAlbumTracks(Gson gson, AlbumService albumService, long albumId) { super(gson, albumService, albumId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtist.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtist.java index b7773b2..056808a 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtist.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtist.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Artist; import io.github.yvasyliev.deezer.service.ArtistService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetArtist extends ObjectServiceMethod { +public class GetArtist extends AbstractObjectServiceMethod { public GetArtist(ArtistService artistService, long artistId) { super(artistService, artistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistAlbums.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistAlbums.java index 31dc661..2df12dd 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistAlbums.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistAlbums.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Album; import io.github.yvasyliev.deezer.service.ArtistService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetArtistAlbums extends ObjectServicePagingMethod { +public class GetArtistAlbums extends AbstractObjectServicePagingMethod { public GetArtistAlbums(Gson gson, ArtistService artistService, long artistId) { super(gson, artistService, artistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistFans.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistFans.java index 33f12ac..8c3bfa0 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistFans.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistFans.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.User; import io.github.yvasyliev.deezer.service.ArtistService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetArtistFans extends ObjectServicePagingMethod { +public class GetArtistFans extends AbstractObjectServicePagingMethod { public GetArtistFans(Gson gson, ArtistService artistService, long artistId) { super(gson, artistService, artistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistPlaylists.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistPlaylists.java index 3dfc069..c1aa73d 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistPlaylists.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistPlaylists.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Playlist; import io.github.yvasyliev.deezer.service.ArtistService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetArtistPlaylists extends ObjectServicePagingMethod { +public class GetArtistPlaylists extends AbstractObjectServicePagingMethod { public GetArtistPlaylists(Gson gson, ArtistService artistService, long artistId) { super(gson, artistService, artistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRadio.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRadio.java index 140441e..eed16ff 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRadio.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRadio.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Track; import io.github.yvasyliev.deezer.service.ArtistService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetArtistRadio extends ObjectServicePagingMethod { +public class GetArtistRadio extends AbstractObjectServicePagingMethod { public GetArtistRadio(Gson gson, ArtistService artistService, long artistId) { super(gson, artistService, artistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRelated.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRelated.java index 29b4c31..86503cc 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRelated.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistRelated.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Artist; import io.github.yvasyliev.deezer.service.ArtistService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetArtistRelated extends ObjectServicePagingMethod { +public class GetArtistRelated extends AbstractObjectServicePagingMethod { public GetArtistRelated(Gson gson, ArtistService artistService, long artistId) { super(gson, artistService, artistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistTop.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistTop.java index 2b2d763..9fed036 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistTop.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/artist/GetArtistTop.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Track; import io.github.yvasyliev.deezer.service.ArtistService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetArtistTop extends ObjectServicePagingMethod { +public class GetArtistTop extends AbstractObjectServicePagingMethod { public GetArtistTop(Gson gson, ArtistService artistService, long artistId) { super(gson, artistService, artistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChart.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChart.java index f268f00..1c90460 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChart.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChart.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Chart; import io.github.yvasyliev.deezer.service.ChartService; -import io.github.yvasyliev.deezer.v2.methods.ServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetChart extends ServiceMethod { +public class GetChart extends AbstractServiceMethod { public GetChart(ChartService chartService) { super(chartService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartAlbums.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartAlbums.java index cf25b65..ea9642e 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartAlbums.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartAlbums.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Album; import io.github.yvasyliev.deezer.service.ChartService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetChartAlbums extends ObjectServicePagingMethod { +public class GetChartAlbums extends AbstractObjectServicePagingMethod { public GetChartAlbums(Gson gson, ChartService chartService, long chartId) { super(gson, chartService, chartId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartArtists.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartArtists.java index ef24200..135c056 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartArtists.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartArtists.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Artist; import io.github.yvasyliev.deezer.service.ChartService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetChartArtists extends ObjectServicePagingMethod { +public class GetChartArtists extends AbstractObjectServicePagingMethod { public GetChartArtists(Gson gson, ChartService chartService, long chartId) { super(gson, chartService, chartId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartById.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartById.java index 795fce4..eccc1b0 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartById.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartById.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Chart; import io.github.yvasyliev.deezer.service.ChartService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetChartById extends ObjectServiceMethod { +public class GetChartById extends AbstractObjectServiceMethod { public GetChartById(ChartService chartService, long chartId) { super(chartService, chartId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPlaylists.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPlaylists.java index 172bf88..9098bd9 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPlaylists.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPlaylists.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Playlist; import io.github.yvasyliev.deezer.service.ChartService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetChartPlaylists extends ObjectServicePagingMethod { +public class GetChartPlaylists extends AbstractObjectServicePagingMethod { public GetChartPlaylists(Gson gson, ChartService chartService, long chartId) { super(gson, chartService, chartId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPodcasts.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPodcasts.java index 717d2c0..ba7e337 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPodcasts.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartPodcasts.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Podcast; import io.github.yvasyliev.deezer.service.ChartService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetChartPodcasts extends ObjectServicePagingMethod { +public class GetChartPodcasts extends AbstractObjectServicePagingMethod { public GetChartPodcasts(Gson gson, ChartService chartService, long chartId) { super(gson, chartService, chartId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartTracks.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartTracks.java index 1c94583..eb6f35b 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartTracks.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/chart/GetChartTracks.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Track; import io.github.yvasyliev.deezer.service.ChartService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetChartTracks extends ObjectServicePagingMethod { +public class GetChartTracks extends AbstractObjectServicePagingMethod { public GetChartTracks(Gson gson, ChartService chartService, long chartId) { super(gson, chartService, chartId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorial.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorial.java index c5a260e..734b309 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorial.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorial.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Editorial; import io.github.yvasyliev.deezer.service.EditorialService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetEditorial extends ObjectServiceMethod { +public class GetEditorial extends AbstractObjectServiceMethod { public GetEditorial(EditorialService editorialService, long editorialId) { super(editorialService, editorialId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialCharts.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialCharts.java index 39b08a9..d016cf7 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialCharts.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialCharts.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Chart; import io.github.yvasyliev.deezer.service.EditorialService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetEditorialCharts extends ObjectServiceMethod { +public class GetEditorialCharts extends AbstractObjectServiceMethod { public GetEditorialCharts(EditorialService editorialService, long editorialId) { super(editorialService, editorialId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialReleases.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialReleases.java index f0c3a03..0c6c7ba 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialReleases.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialReleases.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.Album; import io.github.yvasyliev.deezer.service.EditorialService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetEditorialReleases extends ObjectServicePagingMethod { +public class GetEditorialReleases extends AbstractObjectServicePagingMethod { public GetEditorialReleases(Gson gson, EditorialService editorialService, long editorialId) { super(gson, editorialService, editorialId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialSelection.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialSelection.java index a29c7a4..05aaaeb 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialSelection.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorialSelection.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.Album; import io.github.yvasyliev.deezer.service.EditorialService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetEditorialSelection extends ObjectServicePagingMethod { +public class GetEditorialSelection extends AbstractObjectServicePagingMethod { public GetEditorialSelection(Gson gson, EditorialService editorialService, long editorialId) { super(gson, editorialService, editorialId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorials.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorials.java index 6ae15b6..f5dfc6b 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorials.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/editorial/GetEditorials.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Editorial; import io.github.yvasyliev.deezer.service.EditorialService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetEditorials extends ServicePagingMethod { +public class GetEditorials extends AbstractServicePagingMethod { public GetEditorials(Gson gson, EditorialService editorialService) { super(gson, editorialService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenre.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenre.java index bee0af1..9d1ae93 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenre.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenre.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Genre; import io.github.yvasyliev.deezer.service.GenreService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetGenre extends ObjectServiceMethod { +public class GetGenre extends AbstractObjectServiceMethod { public GetGenre(GenreService genreService, long genreId) { super(genreService, genreId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreArtists.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreArtists.java index 072bf18..92d3c4c 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreArtists.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreArtists.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.Artist; import io.github.yvasyliev.deezer.service.GenreService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetGenreArtists extends ObjectServicePagingMethod { +public class GetGenreArtists extends AbstractObjectServicePagingMethod { public GetGenreArtists(Gson gson, GenreService genreService, long genreId) { super(gson, genreService, genreId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreRadios.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreRadios.java index f0cd827..acffc92 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreRadios.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenreRadios.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.Radio; import io.github.yvasyliev.deezer.service.GenreService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetGenreRadios extends ObjectServicePagingMethod { +public class GetGenreRadios extends AbstractObjectServicePagingMethod { public GetGenreRadios(Gson gson, GenreService genreService, long genreId) { super(gson, genreService, genreId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenres.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenres.java index 27faf56..8670f4b 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenres.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/genre/GetGenres.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Genre; import io.github.yvasyliev.deezer.service.GenreService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetGenres extends ServicePagingMethod { +public class GetGenres extends AbstractServicePagingMethod { public GetGenres(Gson gson, GenreService genreService) { super(gson, genreService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/infos/GetInfos.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/infos/GetInfos.java index 074c3a4..5b6c8ab 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/infos/GetInfos.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/infos/GetInfos.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Infos; import io.github.yvasyliev.deezer.service.InfosService; -import io.github.yvasyliev.deezer.v2.methods.ServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetInfos extends ServiceMethod { +public class GetInfos extends AbstractServiceMethod { public GetInfos(InfosService infosService) { super(infosService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/options/GetOptions.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/options/GetOptions.java index e92bdc7..3072b17 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/options/GetOptions.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/options/GetOptions.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Options; import io.github.yvasyliev.deezer.service.OptionsService; -import io.github.yvasyliev.deezer.v2.methods.ServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetOptions extends ServiceMethod { +public class GetOptions extends AbstractServiceMethod { public GetOptions(OptionsService optionsService) { super(optionsService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylist.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylist.java index 2cb61f1..1c6546e 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylist.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylist.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Playlist; import io.github.yvasyliev.deezer.service.PlaylistService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetPlaylist extends ObjectServiceMethod { +public class GetPlaylist extends AbstractObjectServiceMethod { public GetPlaylist(PlaylistService playlistService, long playlistId) { super(playlistService, playlistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistFans.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistFans.java index 300ee67..fba58f1 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistFans.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistFans.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.User; import io.github.yvasyliev.deezer.service.PlaylistService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetPlaylistFans extends ObjectServicePagingMethod { +public class GetPlaylistFans extends AbstractObjectServicePagingMethod { public GetPlaylistFans(Gson gson, PlaylistService playlistService, long playlistId) { super(gson, playlistService, playlistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistRadio.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistRadio.java index 373b1c2..3455f21 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistRadio.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistRadio.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.Track; import io.github.yvasyliev.deezer.service.PlaylistService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetPlaylistRadio extends ObjectServicePagingMethod { +public class GetPlaylistRadio extends AbstractObjectServicePagingMethod { public GetPlaylistRadio(Gson gson, PlaylistService playlistService, long playlistId) { super(gson, playlistService, playlistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistTracks.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistTracks.java index c51df89..c04f2a6 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistTracks.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/playlist/GetPlaylistTracks.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.Track; import io.github.yvasyliev.deezer.service.PlaylistService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetPlaylistTracks extends ObjectServicePagingMethod { +public class GetPlaylistTracks extends AbstractObjectServicePagingMethod { public GetPlaylistTracks(Gson gson, PlaylistService playlistService, long playlistId) { super(gson, playlistService, playlistId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadio.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadio.java index 8736599..fd452a1 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadio.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadio.java @@ -2,11 +2,11 @@ import io.github.yvasyliev.deezer.objects.Radio; import io.github.yvasyliev.deezer.service.RadioService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServiceMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServiceMethod; import java.util.concurrent.CompletableFuture; -public class GetRadio extends ObjectServiceMethod { +public class GetRadio extends AbstractObjectServiceMethod { public GetRadio(RadioService radioService, long radioId) { super(radioService, radioId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioGenres.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioGenres.java index bf52322..44f221f 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioGenres.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioGenres.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Genre; import io.github.yvasyliev.deezer.service.RadioService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetRadioGenres extends ServicePagingMethod { +public class GetRadioGenres extends AbstractServicePagingMethod { public GetRadioGenres(Gson gson, RadioService radioService) { super(gson, radioService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioLists.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioLists.java index 9777ca7..70e74db 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioLists.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioLists.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Radio; import io.github.yvasyliev.deezer.service.RadioService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetRadioLists extends ServicePagingMethod { +public class GetRadioLists extends AbstractServicePagingMethod { public GetRadioLists(Gson gson, RadioService radioService) { super(gson, radioService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTop.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTop.java index dd23e1e..a78415d 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTop.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTop.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Radio; import io.github.yvasyliev.deezer.service.RadioService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetRadioTop extends ServicePagingMethod { +public class GetRadioTop extends AbstractServicePagingMethod { public GetRadioTop(Gson gson, RadioService radioService) { super(gson, radioService); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTracks.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTracks.java index c037fff..597c826 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTracks.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadioTracks.java @@ -3,13 +3,13 @@ import com.google.gson.Gson; import io.github.yvasyliev.deezer.objects.Track; import io.github.yvasyliev.deezer.service.RadioService; -import io.github.yvasyliev.deezer.v2.methods.ObjectServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractObjectServicePagingMethod; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetRadioTracks extends ObjectServicePagingMethod { +public class GetRadioTracks extends AbstractObjectServicePagingMethod { public GetRadioTracks(Gson gson, RadioService radioService, long radioId) { super(gson, radioService, radioId); } diff --git a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadios.java b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadios.java index 60ab819..5fb2bfd 100644 --- a/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadios.java +++ b/src/main/java/io/github/yvasyliev/deezer/v2/methods/radio/GetRadios.java @@ -4,12 +4,12 @@ import io.github.yvasyliev.deezer.objects.Radio; import io.github.yvasyliev.deezer.service.RadioService; import io.github.yvasyliev.deezer.v2.methods.PagingMethod; -import io.github.yvasyliev.deezer.v2.methods.ServicePagingMethod; +import io.github.yvasyliev.deezer.v2.methods.AbstractServicePagingMethod; import io.github.yvasyliev.deezer.v2.objects.Page; import java.util.concurrent.CompletableFuture; -public class GetRadios extends ServicePagingMethod { +public class GetRadios extends AbstractServicePagingMethod { public GetRadios(Gson gson, RadioService radioService) { super(gson, radioService); }