Handle more null cases better

Author: jwkerr

Diff for: README.md

@@ -7,9 +7,5 @@ If you would like to contribute to the repo, you are welcome to open a pull requ
 Reasons you may open a pull request include but are not limited to:
 - Adding data that is not already included
 - Adding functionality that is not already present
-- Fixing an error or failure to meet the design methodology (defined below)
+- Fixing an error
 - Rewriting code to deduplicate repetition or improve performance
-
-## Design Methodology
-- If data can return as null or empty such as an empty string, the JSON element should under most circumstances be set to a null value. Arrays are exempted from this and should be returned as an empty array.
-- JSON patterns should be repeated throughout responses. Objects should be in the same order if they are shared between any responses, and keys that represent similar or same things such as mayor and king should be in the same or similar spot. This is to keep working with different response types consistent and easily understandable for developers.

Diff for: src/main/java/net/earthmc/emcapi/endpoint/TownsEndpoint.java

@@ -12,7 +12,6 @@
 import net.earthmc.quarters.api.QuartersAPI;
 import net.earthmc.quarters.object.Quarter;
 
-import java.util.Collection;
 import java.util.List;
 
 public class TownsEndpoint {
@@ -67,43 +66,34 @@ public static JsonObject getTownObject(Town town) {
         JsonObject coordinatesObject = EndpointUtils.getCoordinatesObject(town.getSpawnOrNull());
         JsonArray homeBlockArray = new JsonArray();
         TownBlock homeBlock = town.getHomeBlockOrNull();
-        if (homeBlock != null) {
-            homeBlockArray.add(homeBlock.getX());
-            homeBlockArray.add(homeBlock.getZ());
-            coordinatesObject.add("homeBlock", homeBlockArray);
-        } else {
-            coordinatesObject.add("homeBlock", null);
-        }
+        homeBlockArray.add(homeBlock == null ? null : homeBlock.getX());
+        homeBlockArray.add(homeBlock == null ? null : homeBlock.getZ());
+        coordinatesObject.add("homeBlock", homeBlockArray);
 
         JsonArray townBlocksArray = new JsonArray();
-        Collection<TownBlock> townBlocks = town.getTownBlocks();
-        if (!townBlocks.isEmpty()) {
-            for (TownBlock townBlock : town.getTownBlocks()) {
-                JsonArray townBlockArray = new JsonArray();
-                townBlockArray.add(townBlock.getX());
-                townBlockArray.add(townBlock.getZ());
-
-                townBlocksArray.add(townBlockArray);
-            }
+        for (TownBlock townBlock : town.getTownBlocks()) {
+            JsonArray townBlockArray = new JsonArray();
+            townBlockArray.add(townBlock.getX());
+            townBlockArray.add(townBlock.getZ());
 
-            coordinatesObject.add("townBlocks", townBlocksArray);
-        } else {
-            coordinatesObject.add("townBlocks", null);
+            townBlocksArray.add(townBlockArray);
         }
+        coordinatesObject.add("townBlocks", townBlocksArray);
+
         townObject.add("coordinates", coordinatesObject);
 
         townObject.add("residents", EndpointUtils.getResidentArray(town.getResidents()));
         townObject.add("trusted", EndpointUtils.getResidentArray(town.getTrustedResidents().stream().toList()));
         townObject.add("outlaws", EndpointUtils.getResidentArray(town.getTrustedResidents().stream().toList()));
 
-        List<Quarter> quartersList = QuartersAPI.getInstance().getQuartersTown(town).getQuarters();
+        List<Quarter> quartersList = QuartersAPI.getInstance().getQuartersTown(town).getQuarters(); // TODO: make this fucking API method not return null
+        JsonArray quartersArray = new JsonArray();
         if (quartersList != null) {
-            JsonArray quartersArray = new JsonArray();
             for (Quarter quarter : quartersList) {
                 quartersArray.add(quarter.getUUID().toString());
             }
-            townObject.add("quarters", quartersArray);
         }
+        townObject.add("quarters", quartersArray);
 
         JsonObject ranksObject = new JsonObject();
         for (String rank : TownyPerms.getTownRanks()) {

Diff for: src/main/java/net/earthmc/emcapi/util/EndpointUtils.java

@@ -184,20 +184,17 @@ public static JsonArray getResidentArray(List<Resident> residents) {
         JsonArray jsonArray = new JsonArray();
 
         for (Resident resident : residents) {
-            if (resident == null) continue;
             jsonArray.add(getResidentJsonObject(resident));
         }
 
         return jsonArray;
     }
 
     public static JsonObject getResidentJsonObject(Resident resident) {
-        if (resident == null) return null;
-
         JsonObject jsonObject = new JsonObject();
 
-        jsonObject.addProperty("name", resident.getName());
-        jsonObject.addProperty("uuid", resident.getUUID().toString());
+        jsonObject.addProperty("name", resident == null ? null : resident.getName());
+        jsonObject.addProperty("uuid", resident == null ? null : resident.getUUID().toString());
 
         return jsonObject;
     }
@@ -206,20 +203,17 @@ public static JsonArray getTownArray(List<Town> towns) {
         JsonArray jsonArray = new JsonArray();
 
         for (Town town : towns) {
-            if (town == null) continue;
             jsonArray.add(getTownJsonObject(town));
         }
 
         return jsonArray;
     }
 
     public static JsonObject getTownJsonObject(Town town) {
-        if (town == null) return null;
-
         JsonObject jsonObject = new JsonObject();
 
-        jsonObject.addProperty("name", town.getName());
-        jsonObject.addProperty("uuid", town.getUUID().toString());
+        jsonObject.addProperty("name", town == null ? null : town.getName());
+        jsonObject.addProperty("uuid", town == null ? null : town.getUUID().toString());
 
         return jsonObject;
     }
@@ -228,20 +222,17 @@ public static JsonArray getNationArray(List<Nation> nations) {
         JsonArray jsonArray = new JsonArray();
 
         for (Nation nation : nations) {
-            if (nation == null) continue;
             jsonArray.add(getNationJsonObject(nation));
         }
 
         return jsonArray;
     }
 
     public static JsonObject getNationJsonObject(Nation nation) {
-        if (nation == null) return null;
-
         JsonObject jsonObject = new JsonObject();
 
-        jsonObject.addProperty("name", nation.getName());
-        jsonObject.addProperty("uuid", nation.getUUID().toString());
+        jsonObject.addProperty("name", nation == null ? null : nation.getName());
+        jsonObject.addProperty("uuid", nation == null ? null : nation.getUUID().toString());
 
         return jsonObject;
     }