Return null for an invalid element when fetching with a query (bulk i…

…ncluded) instead of aborting the whole request and returning a text error. Remove the "[name] is not a real [type]" message.
EarthMC · Jul 8, 2024 · f48779e · f48779e
1 parent 0c2e49c
commit f48779e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/net/earthmc/emcapi/endpoint/NationsEndpoint.java b/src/main/java/net/earthmc/emcapi/endpoint/NationsEndpoint.java
@@ -12,7 +12,7 @@
 public class NationsEndpoint {
 
     public String lookup(String query) {
-        return EndpointUtils.lookup(query, EndpointUtils::getNationOrNull, "is not a real nation");
+        return EndpointUtils.lookup(query, EndpointUtils::getNationOrNull);
     }
 
     public static JsonObject getNationObject(Nation nation) {

diff --git a/src/main/java/net/earthmc/emcapi/endpoint/PlayersEndpoint.java b/src/main/java/net/earthmc/emcapi/endpoint/PlayersEndpoint.java
@@ -18,7 +18,7 @@ public PlayersEndpoint(Economy economy) {
     }
 
     public String lookup(String query) {
-        return EndpointUtils.lookup(query, EndpointUtils::getResidentOrNull, "is not a real player");
+        return EndpointUtils.lookup(query, EndpointUtils::getResidentOrNull);
     }
 
     public static JsonObject getPlayerObject(Resident resident) {

diff --git a/src/main/java/net/earthmc/emcapi/endpoint/QuartersEndpoint.java b/src/main/java/net/earthmc/emcapi/endpoint/QuartersEndpoint.java
@@ -10,7 +10,7 @@
 public class QuartersEndpoint {
 
     public String lookup(String query) {
-        return EndpointUtils.lookup(query, EndpointUtils::getQuarterOrNull, "is not a real quarter");
+        return EndpointUtils.lookup(query, EndpointUtils::getQuarterOrNull);
     }
 
     public static JsonObject getQuarterObject(Quarter quarter) {

diff --git a/src/main/java/net/earthmc/emcapi/endpoint/TownsEndpoint.java b/src/main/java/net/earthmc/emcapi/endpoint/TownsEndpoint.java
@@ -14,7 +14,7 @@
 public class TownsEndpoint {
 
     public String lookup(String query) {
-        return EndpointUtils.lookup(query, EndpointUtils::getTownOrNull, "is not a real town");
+        return EndpointUtils.lookup(query, EndpointUtils::getTownOrNull);
     }
 
     public static JsonObject getTownObject(Town town) {

diff --git a/src/main/java/net/earthmc/emcapi/util/EndpointUtils.java b/src/main/java/net/earthmc/emcapi/util/EndpointUtils.java
@@ -7,7 +7,6 @@
 import com.palmergames.bukkit.towny.object.Resident;
 import com.palmergames.bukkit.towny.object.Town;
 import com.palmergames.bukkit.towny.object.TownyPermission;
-import io.javalin.http.NotFoundResponse;
 import net.earthmc.emcapi.EMCAPI;
 import net.earthmc.emcapi.endpoint.NationsEndpoint;
 import net.earthmc.emcapi.endpoint.PlayersEndpoint;
@@ -28,7 +27,7 @@
 
 public class EndpointUtils {
 
-    public static String lookup(String query, Function<String, ?> getObject, String notFoundMessage) {
+    public static String lookup(String query, Function<String, ?> getObject) {
         String[] split = query.split(",");
         JsonArray jsonArray = new JsonArray();
 
@@ -47,7 +46,7 @@ public static String lookup(String query, Function<String, ?> getObject, String
                     jsonArray.add(QuartersEndpoint.getQuarterObject((Quarter) object));
                 }
             } else {
-                throw new NotFoundResponse(name + " " + notFoundMessage);
+                jsonArray.add((JsonObject) null);
             }
         }