update to use zoned date time

taahanis · taahanis · commit 41459ad404cd · 2022-04-19T14:45:35.000-07:00
diff --git a/src/main/java/dev/plex/request/impl/AdminsEndpoint.java b/src/main/java/dev/plex/request/impl/AdminsEndpoint.java
@@ -10,9 +10,10 @@
 import dev.plex.request.AbstractServlet;
 import dev.plex.request.GetMapping;
 import dev.plex.util.PlexLog;
-import dev.plex.util.adapter.LocalDateTimeSerializer;
+import dev.plex.util.adapter.ZonedDateTimeSerializer;
 import jakarta.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.stream.Collectors;
 
 import jakarta.servlet.http.HttpServletResponse;
@@ -35,15 +36,15 @@ public String getAdmins(HttpServletRequest request, HttpServletResponse response
         if (player == null)
         {
             // This likely means they've never joined the server before. That's okay. We can just not return IPs.
-            return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));
+            return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));
         }
         if (Plex.get().getSystem().equalsIgnoreCase("ranks"))
         {
             PlexLog.debug("Plex-HTTPD using ranks check");
             if (!player.getRankFromString().isAtLeast(Rank.ADMIN))
             {
                 // Don't return IPs either if the person is not an Admin or above.
-                return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));
+                return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));
             }
         }
         else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))
@@ -53,10 +54,10 @@ else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))
             if (!HTTPDModule.getPermissions().playerHas(null, offlinePlayer, "plex.httpd.admins.access"))
             {
                 // If the person doesn't have permission, don't return IPs
-                return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));
+                return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));
             }
         }
-        return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers());
+        return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers());
     }
 
     private String adminsHTML(String message)
diff --git a/src/main/java/dev/plex/request/impl/PunishmentsEndpoint.java b/src/main/java/dev/plex/request/impl/PunishmentsEndpoint.java
@@ -9,9 +9,10 @@
 import dev.plex.request.AbstractServlet;
 import dev.plex.request.GetMapping;
 import dev.plex.util.PlexLog;
-import dev.plex.util.adapter.LocalDateTimeSerializer;
+import dev.plex.util.adapter.ZonedDateTimeSerializer;
 import jakarta.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.UUID;
 
 import jakarta.servlet.http.HttpServletResponse;
@@ -58,15 +59,15 @@ public String getPunishments(HttpServletRequest request, HttpServletResponse res
         if (player == null)
         {
             // If the player is null, give it to them without the IPs
-            return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());
+            return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());
         }
         if (Plex.get().getSystem().equalsIgnoreCase("ranks"))
         {
             PlexLog.debug("Plex-HTTPD using ranks check");
             if (!player.getRankFromString().isAtLeast(Rank.ADMIN))
             {
                 // Don't return IPs either if the person is not an Admin or above.
-                return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());
+                return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());
             }
         }
         else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))
@@ -76,10 +77,10 @@ else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))
             if (!HTTPDModule.getPermissions().playerHas(null, offlinePlayer, "plex.httpd.punishments.access"))
             {
                 // If the person doesn't have permission, don't return IPs
-                return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());
+                return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());
             }
         }
-        return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().toList());
+        return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().toList());
     }
 
     private String punishmentsHTML(String message)

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,10 @@`
`10`	`10`	`import dev.plex.request.AbstractServlet;`
`11`	`11`	`import dev.plex.request.GetMapping;`
`12`	`12`	`import dev.plex.util.PlexLog;`
`13`		`-import dev.plex.util.adapter.LocalDateTimeSerializer;`
	`13`	`+import dev.plex.util.adapter.ZonedDateTimeSerializer;`
`14`	`14`	`import jakarta.servlet.http.HttpServletRequest;`
`15`	`15`	`import java.time.LocalDateTime;`
	`16`	`+import java.time.ZonedDateTime;`
`16`	`17`	`import java.util.stream.Collectors;`
`17`	`18`
`18`	`19`	`import jakarta.servlet.http.HttpServletResponse;`
`@@ -35,15 +36,15 @@ public String getAdmins(HttpServletRequest request, HttpServletResponse response`
`35`	`36`	`if (player == null)`
`36`	`37`	`{`
`37`	`38`	`// This likely means they've never joined the server before. That's okay. We can just not return IPs.`
`38`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));`
	`39`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));`
`39`	`40`	`}`
`40`	`41`	`if (Plex.get().getSystem().equalsIgnoreCase("ranks"))`
`41`	`42`	`{`
`42`	`43`	`PlexLog.debug("Plex-HTTPD using ranks check");`
`43`	`44`	`if (!player.getRankFromString().isAtLeast(Rank.ADMIN))`
`44`	`45`	`{`
`45`	`46`	`// Don't return IPs either if the person is not an Admin or above.`
`46`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));`
	`47`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))`
`@@ -53,10 +54,10 @@ else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))`
`53`	`54`	`if (!HTTPDModule.getPermissions().playerHas(null, offlinePlayer, "plex.httpd.admins.access"))`
`54`	`55`	`{`
`55`	`56`	`// If the person doesn't have permission, don't return IPs`
`56`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));`
	`57`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers().stream().peek(plexPlayer -> plexPlayer.setIps(Lists.newArrayList())).peek(plexPlayer -> plexPlayer.setPunishments(Lists.newArrayList())).collect(Collectors.toList()));`
`57`	`58`	`}`
`58`	`59`	`}`
`59`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers());`
	`60`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers());`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`private String adminsHTML(String message)`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,10 @@`
`9`	`9`	`import dev.plex.request.AbstractServlet;`
`10`	`10`	`import dev.plex.request.GetMapping;`
`11`	`11`	`import dev.plex.util.PlexLog;`
`12`		`-import dev.plex.util.adapter.LocalDateTimeSerializer;`
	`12`	`+import dev.plex.util.adapter.ZonedDateTimeSerializer;`
`13`	`13`	`import jakarta.servlet.http.HttpServletRequest;`
`14`	`14`	`import java.time.LocalDateTime;`
	`15`	`+import java.time.ZonedDateTime;`
`15`	`16`	`import java.util.UUID;`
`16`	`17`
`17`	`18`	`import jakarta.servlet.http.HttpServletResponse;`
`@@ -58,15 +59,15 @@ public String getPunishments(HttpServletRequest request, HttpServletResponse res`
`58`	`59`	`if (player == null)`
`59`	`60`	`{`
`60`	`61`	`// If the player is null, give it to them without the IPs`
`61`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());`
	`62`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());`
`62`	`63`	`}`
`63`	`64`	`if (Plex.get().getSystem().equalsIgnoreCase("ranks"))`
`64`	`65`	`{`
`65`	`66`	`PlexLog.debug("Plex-HTTPD using ranks check");`
`66`	`67`	`if (!player.getRankFromString().isAtLeast(Rank.ADMIN))`
`67`	`68`	`{`
`68`	`69`	`// Don't return IPs either if the person is not an Admin or above.`
`69`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());`
	`70`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))`
`@@ -76,10 +77,10 @@ else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))`
`76`	`77`	`if (!HTTPDModule.getPermissions().playerHas(null, offlinePlayer, "plex.httpd.punishments.access"))`
`77`	`78`	`{`
`78`	`79`	`// If the person doesn't have permission, don't return IPs`
`79`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());`
	`80`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().peek(punishment -> punishment.setIp("")).toList());`
`80`	`81`	`}`
`81`	`82`	`}`
`82`		`- return new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().toList());`
	`83`	`+ return new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, new ZonedDateTimeSerializer()).setPrettyPrinting().create().toJson(punishedPlayer.getPunishments().stream().toList());`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`private String punishmentsHTML(String message)`