Extract another super class that does not hold anything but primitives.

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

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
index 13af287..085091a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
@@ -17,49 +17,24 @@
 
 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.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 
-import com.google.common.base.Optional;
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
-
 /**
  * Dumb, store-everything-in-memory implementation of an {@link Image}.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class DefaultImage implements Image {
+public class DefaultImage extends AbstractImage {
 
-       private final String id;
        private final Sone sone;
        private final Album album;
-       private final long creationTime;
-       private final int width;
-       private final int height;
-       private String key;
-       private String title;
-       private String description;
 
        public DefaultImage(String id, Sone sone, Album album, String key, long creationTime, int width, int height) {
-               this.id = checkNotNull(id, "id must not be null");
+               super(id, key, creationTime, width, height);
                this.sone = sone;
                this.album = album;
-               this.key = key;
-               this.creationTime = creationTime;
-               this.width = width;
-               this.height = height;
-       }
-
-       @Override
-       public String getId() {
-               return id;
        }
 
        @Override
@@ -72,108 +47,4 @@ public class DefaultImage implements Image {
                return album;
        }
 
-       @Override
-       public String getKey() {
-               return key;
-       }
-
-       @Override
-       public boolean isInserted() {
-               return key != null;
-       }
-
-       @Override
-       public long getCreationTime() {
-               return creationTime;
-       }
-
-       @Override
-       public int getWidth() {
-               return width;
-       }
-
-       @Override
-       public int getHeight() {
-               return height;
-       }
-
-       @Override
-       public String getTitle() {
-               return title;
-       }
-
-       @Override
-       public String getDescription() {
-               return description;
-       }
-
-       @Override
-       public Modifier modify() throws IllegalStateException {
-               // TODO: reenable check for local images
-               return new Modifier() {
-                       private Optional<String> key = absent();
-                       private Optional<String> title = absent();
-                       private Optional<String> description = absent();
-
-                       @Override
-                       public Modifier setKey(String key) {
-                               this.key = fromNullable(key);
-                               return this;
-                       }
-
-                       @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 Image update() throws IllegalStateException {
-                               checkState(!key.isPresent() || (DefaultImage.this.key == null), "key can not be changed");
-
-                               if (key.isPresent()) {
-                                       DefaultImage.this.key = key.get();
-                               }
-                               if (title.isPresent()) {
-                                       DefaultImage.this.title = title.get();
-                               }
-                               if (description.isPresent()) {
-                                       DefaultImage.this.description = description.get();
-                               }
-
-                               return DefaultImage.this;
-                       }
-               };
-       }
-
-       @Override
-       public String getFingerprint() {
-               Hasher hash = Hashing.sha256().newHasher();
-               hash.putString("Image(");
-               hash.putString("ID(").putString(id).putString(")");
-               hash.putString("Title(").putString(title).putString(")");
-               hash.putString("Description(").putString(description).putString(")");
-               hash.putString(")");
-               return hash.hash().toString();
-       }
-
-       @Override
-       public int hashCode() {
-               return id.hashCode();
-       }
-
-       @Override
-       public boolean equals(Object object) {
-               if (!(object instanceof DefaultImage)) {
-                       return false;
-               }
-               return ((DefaultImage) object).id.equals(id);
-       }
-
 }