Don’t use albums in abstract image builders.

[Sone.git] / src / main / java / net / pterodactylus / sone / data / impl / AbstractImageBuilder.java

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/AbstractImageBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/AbstractImageBuilder.java
index 209ef0f..1692bee 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/impl/AbstractImageBuilder.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/AbstractImageBuilder.java
@@ -16,10 +16,9 @@
  */
 package net.pterodactylus.sone.data.impl;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.UUID.randomUUID;
 
-import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.database.ImageBuilder;
 
@@ -31,8 +30,6 @@ import net.pterodactylus.sone.database.ImageBuilder;
  */
 public abstract class AbstractImageBuilder implements ImageBuilder {
 
-       protected final Album album;
-
        /** Whether to create an album with a random ID. */
        protected boolean randomId;
 
@@ -45,10 +42,6 @@ public abstract class AbstractImageBuilder implements ImageBuilder {
        protected int width;
        protected int height;
 
-       public AbstractImageBuilder(Album album) {
-               this.album = checkNotNull(album, "album must not be null");
-       }
-
        @Override
        public ImageBuilder randomId() {
                randomId = true;
@@ -96,6 +89,14 @@ public abstract class AbstractImageBuilder implements ImageBuilder {
        // PROTECTED METHODS
        //
 
+       protected String getId() {
+               return randomId ? randomUUID().toString() : id;
+       }
+
+       protected long getCreationTime() {
+               return createdNow ? System.currentTimeMillis() : creationTime;
+       }
+
        /**
         * Validates the state of this image builder.
         *