From 4be37945cb0f624de01e0884a7561b2f643e9272 Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Sat, 27 Jul 2024 17:41:21 +0200
Subject: [PATCH] Replace google guava with lighter library for a specific map
 implementation.

---
 .gitignore                                    |  4 ++-
 pandalib-reflect/pom.xml                      | 31 +++++++++++++++++--
 .../lib/reflect/wrapper/ReflectWrapper.java   |  8 +++--
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef1ca3c..f643fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /.idea
 /*/target
-dependency-reduced-pom.xml
\ No newline at end of file
+dependency-reduced-pom.xml
+
+*.iml
\ No newline at end of file
diff --git a/pandalib-reflect/pom.xml b/pandalib-reflect/pom.xml
index 38fd2ea..164c222 100644
--- a/pandalib-reflect/pom.xml
+++ b/pandalib-reflect/pom.xml
@@ -25,9 +25,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
+            <groupId>org.plumelib</groupId>
+            <artifactId>hashmap-util</artifactId>
+            <version>0.0.1</version>
         </dependency>
     </dependencies>
 
@@ -47,6 +47,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>io.github.classgraph:classgraph</include>
+                                    <include>org.plumelib:*</include>
                                 </includes>
                             </artifactSet>
                             <filters>
@@ -60,6 +61,26 @@
                                         <exclude>META-INF/MANIFEST.MF</exclude>
                                     </excludes>
                                 </filter>
+                                <filter>
+                                    <artifact>org.plumelib:hashmap-util</artifact>
+                                    <excludes>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.plumelib:reflection-util</artifact>
+                                    <excludes>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
                             </filters>
                             <relocations>
                                 <relocation>
@@ -70,6 +91,10 @@
                                     <pattern>nonapi.io.github.classgraph</pattern>
                                     <shadedPattern>fr.pandacube.lib.reflect.shaded.classgraph.nonapi</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.plumelib</pattern>
+                                    <shadedPattern>fr.pandacube.lib.reflect.shaded.plumelib</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/wrapper/ReflectWrapper.java b/pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/wrapper/ReflectWrapper.java
index 2c94572..1cd4369 100644
--- a/pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/wrapper/ReflectWrapper.java
+++ b/pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/wrapper/ReflectWrapper.java
@@ -1,8 +1,7 @@
 package fr.pandacube.lib.reflect.wrapper;
 
-import com.google.common.collect.MapMaker;
-
 import fr.pandacube.lib.reflect.ReflectConstructor;
+import org.plumelib.util.WeakIdentityHashMap;
 
 import java.util.List;
 import java.util.Map;
@@ -17,7 +16,10 @@ import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
 public abstract class ReflectWrapper implements ReflectWrapperI {
 
 
-	private static final Map<Object, ReflectWrapperI> objectWrapperCache = new MapMaker().weakKeys().makeMap();
+	private static final Map<Object, ReflectWrapperI> objectWrapperCache = new WeakIdentityHashMap<>();
+	/*
+	 * WeakHashMap is not suitable because we want the keys to be compared by reference (==) and not by the .equals() method.
+	 */
 
 	/**
 	 * Unwraps the object from the provided reflect wrapper.