From: David ‘Bombe’ Roden Date: Wed, 7 Oct 2015 17:19:19 +0000 (+0200) Subject: Remove Identified interface X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=df0abbdc635a8b927474515bb100882e6d850336 Remove Identified interface --- diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java index b4c6b0f..3aba779 100644 --- a/src/main/java/net/pterodactylus/sone/data/Album.java +++ b/src/main/java/net/pterodactylus/sone/data/Album.java @@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableList; * * @author David ‘Bombe’ Roden */ -public interface Album extends Identified, Fingerprintable { +public interface Album extends Fingerprintable { /** Compares two {@link Album}s by {@link #getTitle()}. */ Comparator TITLE_COMPARATOR = new Comparator() { diff --git a/src/main/java/net/pterodactylus/sone/data/Identified.java b/src/main/java/net/pterodactylus/sone/data/Identified.java deleted file mode 100644 index 4892479..0000000 --- a/src/main/java/net/pterodactylus/sone/data/Identified.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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 . - */ - -package net.pterodactylus.sone.data; - -import javax.annotation.Nonnull; - -import com.google.common.base.Function; -import com.google.common.base.Optional; - -/** - * Interface for all objects that expose an ID. - * - * @author David ‘Bombe’ Roden - */ -public interface Identified { - - /** Function to extract the ID from an optional. */ - public static final Function, Optional> GET_ID = new Function, Optional>() { - - @Override - @Nonnull - public Optional apply(Optional identified) { - return (identified == null) ? Optional.absent() : (identified.isPresent() ? Optional.of(identified.get().getId()) : Optional.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 f2ef88d..6e8016e 100644 --- a/src/main/java/net/pterodactylus/sone/data/Image.java +++ b/src/main/java/net/pterodactylus/sone/data/Image.java @@ -22,7 +22,7 @@ package net.pterodactylus.sone.data; * * @author David Roden */ -public interface Image extends Identified, Fingerprintable { +public interface Image extends Fingerprintable { /** * Returns the ID of this image. diff --git a/src/main/java/net/pterodactylus/sone/data/Post.java b/src/main/java/net/pterodactylus/sone/data/Post.java index d27d243..099f67e 100644 --- a/src/main/java/net/pterodactylus/sone/data/Post.java +++ b/src/main/java/net/pterodactylus/sone/data/Post.java @@ -30,7 +30,7 @@ import com.google.common.base.Predicate; * * @author David ‘Bombe’ Roden */ -public interface Post extends Identified { +public interface Post { /** Comparator for posts, sorts descending by time. */ public static final Comparator TIME_COMPARATOR = new Comparator() { diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java index cf50a5c..c6c6101 100644 --- a/src/main/java/net/pterodactylus/sone/data/Reply.java +++ b/src/main/java/net/pterodactylus/sone/data/Reply.java @@ -29,7 +29,7 @@ import com.google.common.primitives.Longs; * The type of the reply * @author David ‘Bombe’ Roden */ -public interface Reply> extends Identified { +public interface Reply> { /** Comparator that sorts replies ascending by time. */ Comparator> TIME_COMPARATOR = new Comparator>() { diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java index 7acdb7f..441112a 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -48,7 +48,7 @@ import com.google.common.primitives.Ints; * * @author David ‘Bombe’ Roden */ -public interface Sone extends Identified, Fingerprintable, Comparable { +public interface Sone extends Fingerprintable, Comparable { /** * Enumeration for the possible states of a {@link Sone}. @@ -196,6 +196,8 @@ public interface Sone extends Identified, Fingerprintable, Comparable { } }; + String getId(); + /** * Returns the identity of this Sone. *