From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 28 Jun 2019 11:29:17 +0000 (+0200)
Subject: 🎨 Replace UpdateFoundEvent with Kotlin version
X-Git-Tag: v81^2~203
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e482c6e00025f94082362b3805ca8d38773f66e4;p=Sone.git

🎨 Replace UpdateFoundEvent with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/sone/core/event/UpdateFoundEvent.java b/src/main/java/net/pterodactylus/sone/core/event/UpdateFoundEvent.java
deleted file mode 100644
index 2884090..0000000
--- a/src/main/java/net/pterodactylus/sone/core/event/UpdateFoundEvent.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Sone - UpdateFoundEvent.java - Copyright © 2013–2019 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.core.event;
-
-import net.pterodactylus.util.version.Version;
-
-/**
- * Event that signals that an update for Sone was found.
- */
-public class UpdateFoundEvent {
-
-	private final Version version;
-	private final long releaseTime;
-	private final long latestEdition;
-	private final boolean disruptive;
-
-	public UpdateFoundEvent(Version version, long releaseTime, long latestEdition, boolean disruptive) {
-		this.version = version;
-		this.releaseTime = releaseTime;
-		this.latestEdition = latestEdition;
-		this.disruptive = disruptive;
-	}
-
-	public Version version() {
-		return version;
-	}
-
-	public long releaseTime() {
-		return releaseTime;
-	}
-
-	public long latestEdition() {
-		return latestEdition;
-	}
-
-	public boolean disruptive() {
-		return disruptive;
-	}
-
-}
diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 397fd77..e8aea1b 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -966,10 +966,10 @@ public class WebInterface implements SessionProvider {
 	 */
 	@Subscribe
 	public void updateFound(UpdateFoundEvent updateFoundEvent) {
-		newVersionNotification.set("latestVersion", updateFoundEvent.version());
-		newVersionNotification.set("latestEdition", updateFoundEvent.latestEdition());
-		newVersionNotification.set("releaseTime", updateFoundEvent.releaseTime());
-		newVersionNotification.set("disruptive", updateFoundEvent.disruptive());
+		newVersionNotification.set("latestVersion", updateFoundEvent.getVersion());
+		newVersionNotification.set("latestEdition", updateFoundEvent.getLatestEdition());
+		newVersionNotification.set("releaseTime", updateFoundEvent.getReleaseTime());
+		newVersionNotification.set("disruptive", updateFoundEvent.isDisruptive());
 		notificationManager.addNotification(newVersionNotification);
 	}
 
diff --git a/src/main/kotlin/net/pterodactylus/sone/core/event/UpdateFoundEvent.kt b/src/main/kotlin/net/pterodactylus/sone/core/event/UpdateFoundEvent.kt
new file mode 100644
index 0000000..6c9ccaf
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/core/event/UpdateFoundEvent.kt
@@ -0,0 +1,25 @@
+/*
+ * Sone - UpdateFoundEvent.kt - Copyright © 2013–2019 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.core.event
+
+import net.pterodactylus.util.version.*
+
+/**
+ * Event that signals that an update for Sone was found.
+ */
+data class UpdateFoundEvent(val version: Version, val releaseTime: Long, val latestEdition: Long, val isDisruptive: Boolean)
diff --git a/src/test/java/net/pterodactylus/sone/core/UpdateCheckerTest.java b/src/test/java/net/pterodactylus/sone/core/UpdateCheckerTest.java
index e7f1afe..548051a 100644
--- a/src/test/java/net/pterodactylus/sone/core/UpdateCheckerTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/UpdateCheckerTest.java
@@ -102,9 +102,9 @@ public class UpdateCheckerTest {
 	private void verifyEventIsFired(Version version, long releaseTime, boolean disruptive) {
 		ArgumentCaptor<UpdateFoundEvent> updateFoundEvent = forClass(UpdateFoundEvent.class);
 		verify(eventBus, times(1)).post(updateFoundEvent.capture());
-		assertThat(updateFoundEvent.getValue().version(), is(version));
-		assertThat(updateFoundEvent.getValue().releaseTime(), is(releaseTime));
-		assertThat(updateFoundEvent.getValue().disruptive(), is(disruptive));
+		assertThat(updateFoundEvent.getValue().getVersion(), is(version));
+		assertThat(updateFoundEvent.getValue().getReleaseTime(), is(releaseTime));
+		assertThat(updateFoundEvent.getValue().isDisruptive(), is(disruptive));
 	}
 
 	private void verifyThatUpdateCheckerKnowsLatestVersion(Version version, long releaseTime) {