X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FDefaultAlbum.java;h=3235f17f830b148cc8441cf52ed708b685374bb4;hb=414ee1b03f7155ccb5049ede303dd01020ddcd94;hp=70fac0d9382d8d26a3411ba2c3e77f16364b9b95;hpb=20033c2725145859c3a4d8d75a3008b9fc099b3c;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
index 70fac0d..3235f17 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
@@ -17,11 +17,8 @@
package net.pterodactylus.sone.data.impl;
-import static com.google.common.base.Optional.absent;
-import static com.google.common.base.Optional.fromNullable;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
import java.util.ArrayList;
import java.util.HashMap;
@@ -32,24 +29,20 @@ import java.util.UUID;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.database.AlbumBuilder;
import net.pterodactylus.sone.database.ImageBuilder;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicates;
import com.google.common.collect.Collections2;
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
/**
- * Container for images that can also contain nested {@link Album}s.
+ * Dumb, store-everything-in-memory implementation of an {@link Album}.
*
* @author David âBombeâ Roden
*/
-public class DefaultAlbum implements Album {
-
- /** The ID of this album. */
- private final String id;
+public class DefaultAlbum extends AbstractAlbum {
/** The Sone this album belongs to. */
private Sone sone;
@@ -66,18 +59,9 @@ public class DefaultAlbum implements Album {
/** The parent album. */
private Album parent;
- /** The title of this album. */
- private String title;
-
- /** The description of this album. */
- private String description;
-
- /** The ID of the album picture. */
- private String albumImage;
-
/** Creates a new album with a random ID. */
- public DefaultAlbum() {
- this(UUID.randomUUID().toString());
+ public DefaultAlbum(Sone sone) {
+ this(UUID.randomUUID().toString(), sone);
}
/**
@@ -86,8 +70,9 @@ public class DefaultAlbum implements Album {
* @param id
* The ID of the album
*/
- public DefaultAlbum(String id) {
- this.id = checkNotNull(id, "id must not be null");
+ public DefaultAlbum(String id, Sone sone) {
+ super(id);
+ this.sone = sone;
}
//
@@ -95,39 +80,16 @@ public class DefaultAlbum implements Album {
//
@Override
- public String getId() {
- return id;
- }
-
- @Override
public Sone getSone() {
return sone;
}
@Override
- public Album setSone(Sone sone) {
- checkNotNull(sone, "sone must not be null");
- checkState((this.sone == null) || (this.sone.equals(sone)), "album owner must not already be set to some other Sone");
- this.sone = sone;
- return this;
- }
-
- @Override
public List getAlbums() {
return new ArrayList(albums);
}
@Override
- public void addAlbum(Album album) {
- checkNotNull(album, "album must not be null");
- checkArgument(album.getSone().equals(sone), "album must belong to the same Sone as this album");
- album.setParent(this);
- if (!albums.contains(album)) {
- albums.add(album);
- }
- }
-
- @Override
public void removeAlbum(Album album) {
checkNotNull(album, "album must not be null");
checkArgument(album.getSone().equals(sone), "album must belong this albumâs Sone");
@@ -231,16 +193,6 @@ public class DefaultAlbum implements Album {
}
@Override
- public boolean isEmpty() {
- return albums.isEmpty() && images.isEmpty();
- }
-
- @Override
- public boolean isRoot() {
- return parent == null;
- }
-
- @Override
public Album getParent() {
return parent;
}
@@ -258,18 +210,20 @@ public class DefaultAlbum implements Album {
}
@Override
- public String getTitle() {
- return title;
- }
-
- @Override
- public String getDescription() {
- return description;
+ public AlbumBuilder newAlbumBuilder() {
+ return new DefaultAlbumBuilder(sone) {
+ @Override
+ public Album build() throws IllegalStateException {
+ Album album = super.build();
+ albums.add(album);
+ return album;
+ }
+ };
}
@Override
public ImageBuilder newImageBuilder() throws IllegalStateException {
- return new DefaultImageBuilder(this) {
+ return new DefaultImageBuilder(sone, this) {
@Override
public Image build() throws IllegalStateException {
Image image = super.build();
@@ -283,101 +237,4 @@ public class DefaultAlbum implements Album {
};
}
- @Override
- public Modifier modify() throws IllegalStateException {
- // TODO: reenable check for local Sones
- return new Modifier() {
- private Optional title = absent();
-
- private Optional description = absent();
-
- private Optional albumImage = absent();
-
- @Override
- public Modifier setTitle(String title) {
- this.title = fromNullable(title);
- return this;
- }
-
- @Override
- public Modifier setDescription(String description) {
- this.description = fromNullable(description);
- return this;
- }
-
- @Override
- public Modifier setAlbumImage(String imageId) {
- this.albumImage = fromNullable(imageId);
- return this;
- }
-
- @Override
- public Album update() throws IllegalStateException {
- if (title.isPresent()) {
- DefaultAlbum.this.title = title.get();
- }
- if (description.isPresent()) {
- DefaultAlbum.this.description = description.get();
- }
- if (albumImage.isPresent()) {
- DefaultAlbum.this.albumImage = albumImage.get();
- }
- return DefaultAlbum.this;
- }
- };
- }
-
- //
- // FINGERPRINTABLE METHODS
- //
-
- @Override
- public String getFingerprint() {
- Hasher hash = Hashing.sha256().newHasher();
- hash.putString("Album(");
- hash.putString("ID(").putString(id).putString(")");
- hash.putString("Title(").putString(title).putString(")");
- hash.putString("Description(").putString(description).putString(")");
- if (albumImage != null) {
- hash.putString("AlbumImage(").putString(albumImage).putString(")");
- }
-
- /* add nested albums. */
- hash.putString("Albums(");
- for (Album album : albums) {
- hash.putString(album.getFingerprint());
- }
- hash.putString(")");
-
- /* add images. */
- hash.putString("Images(");
- for (Image image : getImages()) {
- if (image.isInserted()) {
- hash.putString(image.getFingerprint());
- }
- }
- hash.putString(")");
-
- hash.putString(")");
- return hash.hash().toString();
- }
-
- //
- // OBJECT METHODS
- //
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-
- @Override
- public boolean equals(Object object) {
- if (!(object instanceof DefaultAlbum)) {
- return false;
- }
- DefaultAlbum album = (DefaultAlbum) object;
- return id.equals(album.id);
- }
-
}