simplify notifications()

Derkades · Derkades · commit af7ecd3cce45 · 2022-08-08T11:21:21.000+02:00
diff --git a/src/com/namelessmc/java_api/NamelessUser.java b/src/com/namelessmc/java_api/NamelessUser.java
@@ -4,7 +4,6 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.namelessmc.java_api.Notification.Type;
 import com.namelessmc.java_api.exception.ApiError;
 import com.namelessmc.java_api.exception.ApiException;
 import com.namelessmc.java_api.exception.NamelessException;
@@ -223,16 +222,7 @@ public int notificationCount() throws NamelessException {
 
 	public List<Notification> notifications() throws NamelessException {
 		final JsonObject response = this.requests.get("users/" + this.userTransformer + "/notifications");
-
-		final List<Notification> notifications = new ArrayList<>();
-		response.getAsJsonArray("notifications").forEach((element) -> {
-			final String message = element.getAsJsonObject().get("message").getAsString();
-			final String url = element.getAsJsonObject().get("url").getAsString();
-			final Type type = Type.fromString(element.getAsJsonObject().get("type").getAsString());
-			notifications.add(new Notification(message, url, type));
-		});
-
-		return notifications;
+		return GsonHelper.toObjectList(response.getAsJsonArray("notifications"), Notification::new);
 	}
 
 	/**
diff --git a/src/com/namelessmc/java_api/Notification.java b/src/com/namelessmc/java_api/Notification.java
@@ -1,15 +1,17 @@
 package com.namelessmc.java_api;
 
+import com.google.gson.JsonObject;
+
 public class Notification {
 
 	private final String message;
 	private final String url;
 	private final Type type;
 
-	public Notification(final String message, final String url, final Type type) {
-		this.message = message;
-		this.url = url;
-		this.type = type;
+	public Notification(JsonObject json) {
+		this.message = json.get("message").getAsString();
+		this.url = json.get("url").getAsString();
+		this.type = Type.fromString(json.get("type").getAsString());
 	}
 
 	public String message() {
