X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=1ec4d7b6f7482a1d5b3e1e943ccf6d656111d693;hb=c2f9f5293a81bdf2606f56f3822779a4639a1356;hp=8ce908b700aa8b4eb86a0bc81c1a645676200895;hpb=3d6e9664c7f0eb1ff37111b7cbd1bfdca2798567;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 8ce908b..1ec4d7b 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -52,7 +52,6 @@ import net.pterodactylus.sone.core.event.SoneLockedEvent;
 import net.pterodactylus.sone.core.event.SoneRemovedEvent;
 import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
 import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.AlbumImpl;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -641,7 +640,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		if (!create) {
 			return null;
 		}
-		Album newAlbum = new AlbumImpl(albumId);
+		Album newAlbum = database.newAlbumBuilder().withId(albumId).build();
 		database.storeAlbum(newAlbum);
 		return newAlbum;
 	}
@@ -1248,7 +1247,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid album found, aborting load!");
 				return;
 			}
-			Album album = getAlbum(albumId).setSone(sone).setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId);
+			Album album = getAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
 			if (albumParentId != null) {
 				Album parentAlbum = getAlbum(albumParentId, false);
 				if (parentAlbum == null) {
@@ -1601,7 +1600,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The new album
 	 */
 	public Album createAlbum(Sone sone, Album parent) {
-		AlbumImpl album = new AlbumImpl();
+		Album album = database.newAlbumBuilder().randomId().build();
 		database.storeAlbum(album);
 		album.setSone(sone);
 		parent.addAlbum(album);