Use ImmutableMap when Serializing

FloLoFlo · Dec 2, 2023 · 9e9ca78 · 9e9ca78
1 parent 3fcbe0f
commit 9e9ca78
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/economy/market/Receipt.java b/api/src/main/java/us/teaminceptus/novaconomy/api/economy/market/Receipt.java
@@ -1,5 +1,6 @@
 package us.teaminceptus.novaconomy.api.economy.market;
 
+import com.google.common.collect.ImmutableMap;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
@@ -11,7 +12,6 @@
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -128,13 +128,13 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo
 
     @Override
     public Map<String, Object> serialize() {
-        return new HashMap<String, Object>() {{
-            put("timestamp", timestamp);
-            put("purchased", purchased.name());
-            put("amount", purchaseAmount);
-            put("purchaser", purchaserUUID.toString());
-            put("price", purchasePrice);
-        }};
+        return ImmutableMap.<String, Object>builder()
+                .put("timestamp", timestamp)
+                .put("purchased", purchased.name())
+                .put("amount", purchaseAmount)
+                .put("purchaser", purchaserUUID.toString())
+                .put("price", purchasePrice)
+                .build();
     }
 
     /**

diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/player/Bounty.java b/api/src/main/java/us/teaminceptus/novaconomy/api/player/Bounty.java
@@ -1,13 +1,13 @@
 package us.teaminceptus.novaconomy.api.player;
 
+import com.google.common.collect.ImmutableMap;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import us.teaminceptus.novaconomy.api.economy.Economy;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -93,13 +93,12 @@ public void setAmount(double amount) {
 
     @Override
     public Map<String, Object> serialize() {
-        Bounty b = this;
-        return new HashMap<String, Object>() {{
-            put("owner", b.owner.getPlayer().getUniqueId().toString());
-            put("target", b.target.getUniqueId().toString());
-            put("amount", b.amount);
-            put("economy", b.econ.getUniqueId().toString());
-        }};
+        return ImmutableMap.<String, Object>builder()
+                .put("owner", owner.getUniqueId().toString())
+                .put("target", target.getUniqueId().toString())
+                .put("amount", amount)
+                .put("economy", econ.getUniqueId().toString())
+                .build();
     }
 
     private void save() {

diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/util/BusinessProduct.java b/api/src/main/java/us/teaminceptus/novaconomy/api/util/BusinessProduct.java
@@ -1,12 +1,12 @@
 package us.teaminceptus.novaconomy.api.util;
 
+import com.google.common.collect.ImmutableMap;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import us.teaminceptus.novaconomy.api.business.Business;
 import us.teaminceptus.novaconomy.api.economy.Economy;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
@@ -97,9 +97,10 @@ public String toString() {
 
     @Override
     public Map<String, Object> serialize() {
-        return new HashMap<String, Object>(super.serialize()) {{
-            put("business", business.getUniqueId().toString());
-        }};
+        return ImmutableMap.<String, Object>builder()
+                .putAll(super.serialize())
+                .put("business", business.getUniqueId().toString())
+                .build();
     }
 
     /**

diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/util/Price.java b/api/src/main/java/us/teaminceptus/novaconomy/api/util/Price.java
@@ -1,5 +1,6 @@
 package us.teaminceptus.novaconomy.api.util;
 
+import com.google.common.collect.ImmutableMap;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -10,7 +11,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
@@ -210,10 +210,12 @@ public String toString() {
 
     @Override
     public Map<String, Object> serialize() {
-        return new HashMap<String, Object>() {{
-            put("amount", amount);
-            if (econ != null) put("economy", econ.getUniqueId().toString());
-        }};
+        ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder()
+                .put("amount", amount);
+
+        if (econ != null) builder.put("economy", econ.getUniqueId().toString());
+
+        return builder.build();
     }
 
     /**

diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/util/Product.java b/api/src/main/java/us/teaminceptus/novaconomy/api/util/Product.java
@@ -1,5 +1,6 @@
 package us.teaminceptus.novaconomy.api.util;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
@@ -8,7 +9,6 @@
 import org.jetbrains.annotations.Nullable;
 import us.teaminceptus.novaconomy.api.economy.Economy;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -128,10 +128,10 @@ public Product setPrice(@NotNull Price price) throws IllegalArgumentException {
 
     @Override
     public Map<String, Object> serialize() {
-        return new HashMap<String, Object>() {{
-            put("price", price);
-            put("item", item);
-        }};
+        return ImmutableMap.<String, Object>builder()
+                .put("price", price)
+                .put("item", item)
+                .build();
     }
 
     @Override