X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2FAlbumDatabase.java;h=2174553af076677ff6c5b3a3dc14c7724195b6cb;hb=9f9834453e9555175e4771932d9521209bd7188c;hp=f07523ba338ec86e25da51b3fb5f54be2da0864f;hpb=592b5d6d1ccc49bb4d95d36eb0eca807afcbaa4c;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/database/AlbumDatabase.java b/src/main/java/net/pterodactylus/sone/database/AlbumDatabase.java
index f07523b..2174553 100644
--- a/src/main/java/net/pterodactylus/sone/database/AlbumDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/AlbumDatabase.java
@@ -17,17 +17,26 @@
 
 package net.pterodactylus.sone.database;
 
+import java.util.List;
+
 import net.pterodactylus.sone.data.Album;
 
+import com.google.common.base.Optional;
+
 /**
- * Combines an {@link AlbumProvider} and an {@link AlbumStore} into an album
- * database.
+ * Database for handling {@link Album}s.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface AlbumDatabase extends AlbumProvider, AlbumStore {
+public interface AlbumDatabase {
+
+	Optional<Album> getAlbum(String albumId);
+	List<Album> getAlbums(Album parent);
 
-	void moveUp(Album album);
 	void moveDown(Album album);
+	void moveUp(Album album);
+
+	void storeAlbum(Album album);
+	void removeAlbum(Album album);
 
 }