BREAKING: Recreate profiles

Author: Innectic

API/pom.xml

@@ -10,4 +10,11 @@
 
     <artifactId>PermissifyAPI</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+    </dependencies>
 </project>

API/src/main/java/me/innectic/permissify/api/PermissifyConstants.java

@@ -37,6 +37,8 @@
 public class PermissifyConstants {
     // TODO: Create a language formatter to allow for translating.
 
+    public static final int PERMISSIFY_PROFILE_VERSION = 2;
+
     // Chat messages
     private static final String PERMISSIFY_PREFIX = "&a&lPermissify> ";
 

API/src/main/java/me/innectic/permissify/api/database/DatabaseHandler.java

@@ -45,6 +45,7 @@ public abstract class DatabaseHandler {
     @Getter protected Optional<PermissionGroup> defaultGroup = Optional.empty();
     @Getter protected final Optional<ConnectionInformation> connectionInformation;
     @Getter protected List<UUID> superAdmins = new ArrayList<>();
+    // Revisit: Maybe different default formatters?
     protected String chatFormat = "{group} {username}: {message}";
     protected String whisperFormat = "{senderGroup} {username} > {receiverGroup} {to}: {message}";
 

API/src/main/java/me/innectic/permissify/api/group/Permission.java

@@ -35,7 +35,7 @@
  * @since 6/8/2017
  */
 @AllArgsConstructor
-public class Permission implements Serializable {
+public class Permission {
     @Getter private String permission;
     @Getter @Setter private boolean granted;
 }

API/src/main/java/me/innectic/permissify/api/group/group/PermissionGroup.java

@@ -39,7 +39,7 @@
  * @since 6/14/2017
  */
 @RequiredArgsConstructor
-public class PermissionGroup implements Serializable {
+public class PermissionGroup {
     @Getter private final String name;
     @Getter private final String chatColor;
     @Getter private final String prefix;

API/src/main/java/me/innectic/permissify/api/group/ladder/AbstractLadder.java

@@ -33,7 +33,7 @@
  * @author Innectic
  * @since 9/1/2017
  */
-public abstract class AbstractLadder implements Serializable {
+public abstract class AbstractLadder {
     @Getter protected Map<UUID, LadderLevel> players = new HashMap<>();
     @Getter protected List<LadderLevel> levels = new ArrayList<>();
 

API/src/main/java/me/innectic/permissify/api/profile/PermissifyProfile.java

@@ -39,11 +39,25 @@
  * @since 8/26/2017
  */
 @AllArgsConstructor
-public class PermissifyProfile implements Serializable {
+public class PermissifyProfile {
     @Getter private final Map<String, PermissionGroup> groups;
     @Getter private Map<UUID, List<Permission>> playerPermissions;
     @Getter private PermissionGroup defaultGroup;
     @Getter private String chatFormat;
     @Getter private String whisperFormat;
     @Getter private List<UUID> superAdmins;
+    @Getter private int version;
+
+    @Override
+    public String toString() {
+        return "PermissifyProfile {" +
+                "groups=" + groups +
+                ", playerPermissions=" + playerPermissions +
+                ", defaultGroup=" + defaultGroup +
+                ", chatFormat=" + chatFormat +
+                ", whisperFormat=" + whisperFormat +
+                ", superAdmins=" + superAdmins +
+                ", version=" + version +
+                " }";
+    }
 }

API/src/main/java/me/innectic/permissify/api/profile/ProfileSerializer.java

@@ -24,7 +24,13 @@
  */
 package me.innectic.permissify.api.profile;
 
+import com.google.gson.Gson;
+
 import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Optional;
 
 /**
@@ -33,6 +39,8 @@
  */
 public class ProfileSerializer {
 
+    private Gson gson = new Gson();
+
     /**
      * Serialize a permissify profile into a permissify profile file
      *
@@ -42,12 +50,10 @@ public class ProfileSerializer {
      * @return              if the profile was successfully stored
      */
     public boolean serialize(PermissifyProfile profile, String baseDirectory, String profileName) {
+        String json = gson.toJson(profile);
+        Path file = Paths.get(baseDirectory + "/profiles/" + profileName + ".permissify");
         try {
-            FileOutputStream outputStream = new FileOutputStream(baseDirectory + "/profiles/" + profileName + ".permissify");
-            ObjectOutputStream out = new ObjectOutputStream(outputStream);
-            out.writeObject(profile);
-            out.close();
-            outputStream.close();
+            Files.write(file, json.getBytes());
         } catch (IOException e) {
             e.printStackTrace();
             return false;
@@ -65,10 +71,9 @@ public boolean serialize(PermissifyProfile profile, String baseDirectory, String
     public Optional<PermissifyProfile> deserialize(String profile, String baseDirectory) {
         Optional<PermissifyProfile> deserialized = Optional.empty();
         try {
-            FileInputStream inputStream = new FileInputStream(baseDirectory + "/profiles/" + profile + ".permissify");
-            ObjectInputStream input = new ObjectInputStream(inputStream);
-            deserialized = Optional.of((PermissifyProfile) input.readObject());
-        } catch (IOException | ClassNotFoundException e) {
+            Reader reader = new FileReader(new File(baseDirectory + "/profiles/" + profile + ".permissify"));
+            deserialized = Optional.ofNullable(gson.fromJson(reader, PermissifyProfile.class));
+        } catch (FileNotFoundException e) {
             e.printStackTrace();
         }
         return deserialized;

API/src/main/java/me/innectic/permissify/api/util/ChatFormatter.java

@@ -52,15 +52,15 @@ public static String formatChat(UUID uuid, String username, String message) {
 
         Optional<PermissionGroup> group = handler.getPrimaryGroup(uuid);
         if (!group.isPresent()) return username + ": " + message; // TODO: Should be configurable
-        String prefix = group.map(PermissionGroup::getPrefix).orElse("");
-        String name = group.map(PermissionGroup::getName).orElse("");
-        String suffix = group.map(PermissionGroup::getSuffix).orElse("");
-        String chatColor = "&" + group.map(PermissionGroup::getChatColor);
+        String groupPrefix = group.map(PermissionGroup::getPrefix).orElse("");
+        String groupName = group.map(PermissionGroup::getName).orElse("");
+        String groupSuffix = group.map(PermissionGroup::getSuffix).orElse("");
+        String messageColor = "&" + group.map(PermissionGroup::getChatColor).orElse("");
 
         String formatter = handler.getChatFormat(false);
-        String finalGroup = prefix + name + suffix;
+        String finalGroup = groupPrefix + groupName + groupSuffix;
         return formatter.replace("{group}", finalGroup)
-                .replace("{username}", username).replace("{message}", chatColor + message);
+                .replace("{username}", username).replace("{message}", messageColor + message);
     }
 
     /**

Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/ProfileCommand.java

@@ -98,7 +98,8 @@ private boolean saveProfile(String name) {
         long start = System.currentTimeMillis();
         PermissifyProfile profile = new PermissifyProfile(handler.getGroups(), handler.getCachedPermissions(),
                 handler.getDefaultGroup().isPresent() ? handler.getDefaultGroup().get() : null,
-                handler.getChatFormat(false), handler.getWhisperFormat(false), handler.getSuperAdmins());
+                handler.getChatFormat(false), handler.getWhisperFormat(false), handler.getSuperAdmins(),
+                PermissifyConstants.PERMISSIFY_PROFILE_VERSION);
         long end = System.currentTimeMillis();
         System.out.println("Generated profile in " + (end - start) + " ms.");