From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 22 Feb 2019 14:06:26 +0000 (+0100)
Subject: Replace Identified with Kotlin version
X-Git-Tag: v79^2~107^2~2
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=cbae21d2d447a9de493940bf700b9ba9930d25a7;p=Sone.git

Replace Identified with Kotlin version
---

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 12e1b72..0000000
--- a/src/main/java/net/pterodactylus/sone/data/Identified.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Sone - Identified.java - Copyright © 2013–2016 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 javax.annotation.Nonnull;
-
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-
-/**
- * Interface for all objects that expose an ID.
- */
-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
-		@Nonnull
-		public Optional<String> apply(Optional<? extends Identified> identified) {
-			return (identified == null) ? Optional.<String>absent() : (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/kotlin/net/pterodactylus/sone/data/Identified.kt b/src/main/kotlin/net/pterodactylus/sone/data/Identified.kt
new file mode 100644
index 0000000..53fd777
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/data/Identified.kt
@@ -0,0 +1,27 @@
+/*
+ * Sone - Identified.java - Copyright © 2013–2016 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
+
+/**
+ * Interface for all objects that expose an ID.
+ */
+interface Identified {
+
+	val id: String
+
+}