From f855be86d4d02a29c4603522c793a3b0eecc961c Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Mon, 15 Jul 2013 07:12:45 +0200
Subject: [PATCH] Add and implement Identified interface.

---
 .../java/net/pterodactylus/sone/data/Album.java    |  2 +-
 .../net/pterodactylus/sone/data/Identified.java    | 46 ++++++++++++++++++++++
 .../java/net/pterodactylus/sone/data/Image.java    |  2 +-
 .../java/net/pterodactylus/sone/data/Post.java     |  2 +-
 .../java/net/pterodactylus/sone/data/Reply.java    |  2 +-
 .../java/net/pterodactylus/sone/data/Sone.java     |  2 +-
 6 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/net/pterodactylus/sone/data/Identified.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index c47d83f..0c8780c 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -44,7 +44,7 @@ import com.google.common.hash.Hashing;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Album implements Fingerprintable {
+public class Album implements Identified, Fingerprintable {
 
 	/** Compares two {@link Album}s by {@link #getTitle()}. */
 	public static final Comparator<Album> TITLE_COMPARATOR = new Comparator<Album>() {
diff --git a/src/main/java/net/pterodactylus/sone/data/Identified.java b/src/main/java/net/pterodactylus/sone/data/Identified.java
new file mode 100644
index 0000000..f12f842
--- /dev/null
+++ b/src/main/java/net/pterodactylus/sone/data/Identified.java
@@ -0,0 +1,46 @@
+/*
+ * Sone - Identified.java - Copyright © 2013 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone.data;
+
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+
+/**
+ * Interface for all objects that expose an ID.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public interface Identified {
+
+	/** Function to extract the ID from an optional. */
+	public static final Function<Optional<? extends Identified>, Optional<String>> GET_ID = new Function<Optional<? extends Identified>, Optional<String>>() {
+
+		@Override
+		public Optional<String> apply(Optional<? extends Identified> identified) {
+			return identified.isPresent() ? Optional.of(identified.get().getId()) : Optional.<String>absent();
+		}
+	};
+
+	/**
+	 * Returns the ID of this element.
+	 *
+	 * @return The ID of this element
+	 */
+	public String getId();
+
+}
diff --git a/src/main/java/net/pterodactylus/sone/data/Image.java b/src/main/java/net/pterodactylus/sone/data/Image.java
index 952d540..d8a8ab1 100644
--- a/src/main/java/net/pterodactylus/sone/data/Image.java
+++ b/src/main/java/net/pterodactylus/sone/data/Image.java
@@ -31,7 +31,7 @@ import com.google.common.hash.Hashing;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Image implements Fingerprintable {
+public class Image implements Identified, Fingerprintable {
 
 	/** The ID of the image. */
 	private final String id;
diff --git a/src/main/java/net/pterodactylus/sone/data/Post.java b/src/main/java/net/pterodactylus/sone/data/Post.java
index 6523e9b..4860a01 100644
--- a/src/main/java/net/pterodactylus/sone/data/Post.java
+++ b/src/main/java/net/pterodactylus/sone/data/Post.java
@@ -28,7 +28,7 @@ import com.google.common.base.Predicate;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Post {
+public interface Post extends Identified {
 
 	/** Comparator for posts, sorts descending by time. */
 	public static final Comparator<Post> TIME_COMPARATOR = new Comparator<Post>() {
diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java
index a686023..60e5eeb 100644
--- a/src/main/java/net/pterodactylus/sone/data/Reply.java
+++ b/src/main/java/net/pterodactylus/sone/data/Reply.java
@@ -28,7 +28,7 @@ import com.google.common.base.Predicate;
  *            The type of the reply
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Reply<T extends Reply<T>> {
+public interface Reply<T extends Reply<T>> extends Identified {
 
 	/** Comparator that sorts replies ascending by time. */
 	public static final Comparator<? super Reply<?>> TIME_COMPARATOR = new Comparator<Reply<?>>() {
diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 6bee1c1..8b15720 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -54,7 +54,7 @@ import com.google.common.primitives.Ints;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Sone implements Fingerprintable, Comparable<Sone> {
+public class Sone implements Identified, Fingerprintable, Comparable<Sone> {
 
 	/**
 	 * Enumeration for the possible states of a {@link Sone}.
-- 
2.7.4