X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FAlbumImpl.java;h=04ab8e99a09744aa02c5027f953f3e3ec00e625f;hp=991459ac8faac60e1d71bc034f9d3c2ae84d89ed;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=c4ae226ec5052116cefc542ae2017036a7bc6332

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
index 991459a..04ab8e9 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
@@ -1,5 +1,5 @@
 /*
- * Sone - AlbumImpl.java - Copyright © 2011–2016 David Roden
+ * Sone - AlbumImpl.java - Copyright © 2011–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,32 +17,20 @@
 
 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 java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.Image;
-import net.pterodactylus.sone.data.Sone;
-
-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 java.util.*;
+import javax.annotation.*;
+
+import com.google.common.base.*;
+import com.google.common.collect.*;
 import com.google.common.hash.Hashing;
+import com.google.common.hash.*;
+import net.pterodactylus.sone.data.*;
+
+import static com.google.common.base.Preconditions.*;
+import static java.nio.charset.StandardCharsets.*;
 
 /**
  * Container for images that can also contain nested {@link AlbumImpl}s.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class AlbumImpl implements Album {
 
@@ -53,13 +41,13 @@ public class AlbumImpl implements Album {
 	private final Sone sone;
 
 	/** Nested albums. */
-	private final List<Album> albums = new ArrayList<Album>();
+	private final List<Album> albums = new ArrayList<>();
 
 	/** The image IDs in order. */
-	private final List<String> imageIds = new ArrayList<String>();
+	private final List<String> imageIds = new ArrayList<>();
 
 	/** The images in this album. */
-	private final Map<String, Image> images = new HashMap<String, Image>();
+	private final Map<String, Image> images = new HashMap<>();
 
 	/** The parent album. */
 	private Album parent;
@@ -102,7 +90,7 @@ public class AlbumImpl implements Album {
 
 	@Override
 	public List<Album> getAlbums() {
-		return new ArrayList<Album>(albums);
+		return new ArrayList<>(albums);
 	}
 
 	@Override
@@ -154,7 +142,7 @@ public class AlbumImpl implements Album {
 
 	@Override
 	public List<Image> getImages() {
-		return new ArrayList<Image>(Collections2.filter(Collections2.transform(imageIds, new Function<String, Image>() {
+		return new ArrayList<>(Collections2.filter(Collections2.transform(imageIds, new Function<String, Image>() {
 
 			@Override
 			@SuppressWarnings("synthetic-access")
@@ -259,32 +247,33 @@ public class AlbumImpl implements Album {
 	public Modifier modify() throws IllegalStateException {
 		// TODO: reenable check for local Sones
 		return new Modifier() {
-			private Optional<String> title = absent();
-
-			private Optional<String> description = absent();
+			@Nullable
+			private String title;
+			@Nullable
+			private String description;
 
 			@Override
 			public Modifier setTitle(String title) {
-				this.title = fromNullable(title);
+				this.title = title;
 				return this;
 			}
 
 			@Override
 			public Modifier setDescription(String description) {
-				this.description = fromNullable(description);
+				this.description = description;
 				return this;
 			}
 
 			@Override
 			public Album update() throws IllegalStateException {
-				if (title.isPresent() && title.get().trim().isEmpty()) {
+				if (title != null && title.trim().isEmpty()) {
 					throw new AlbumTitleMustNotBeEmpty();
 				}
-				if (title.isPresent()) {
-					AlbumImpl.this.title = title.get();
+				if (title != null) {
+					AlbumImpl.this.title = title;
 				}
-				if (description.isPresent()) {
-					AlbumImpl.this.description = description.get();
+				if (description != null) {
+					AlbumImpl.this.description = description;
 				}
 				return AlbumImpl.this;
 			}
@@ -298,28 +287,28 @@ public class AlbumImpl implements Album {
 	@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(")");
+		hash.putString("Album(", UTF_8);
+		hash.putString("ID(", UTF_8).putString(id, UTF_8).putString(")", UTF_8);
+		hash.putString("Title(", UTF_8).putString(title, UTF_8).putString(")", UTF_8);
+		hash.putString("Description(", UTF_8).putString(description, UTF_8).putString(")", UTF_8);
 
 		/* add nested albums. */
-		hash.putString("Albums(");
+		hash.putString("Albums(", UTF_8);
 		for (Album album : albums) {
-			hash.putString(album.getFingerprint());
+			hash.putString(album.getFingerprint(), UTF_8);
 		}
-		hash.putString(")");
+		hash.putString(")", UTF_8);
 
 		/* add images. */
-		hash.putString("Images(");
+		hash.putString("Images(", UTF_8);
 		for (Image image : getImages()) {
 			if (image.isInserted()) {
-				hash.putString(image.getFingerprint());
+				hash.putString(image.getFingerprint(), UTF_8);
 			}
 		}
-		hash.putString(")");
+		hash.putString(")", UTF_8);
 
-		hash.putString(")");
+		hash.putString(")", UTF_8);
 		return hash.hash().toString();
 	}