From 3fae4e5e9e51d7a9ca74818c49edead95721f0d6 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 29 Dec 2019 18:34:55 +0000
Subject: [PATCH] Refactor CacheMetadata

---
 .../luckperms/common/cacheddata/CacheMetadata.java   | 12 +-----------
 .../common/cacheddata/GroupCachedDataManager.java    |  2 +-
 .../common/cacheddata/UserCachedDataManager.java     |  2 +-
 .../CalculatedSubjectCachedDataManager.java          |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java
index 99cca5733..29ed022a3 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java
@@ -35,11 +35,6 @@ import net.luckperms.api.query.QueryOptions;
  */
 public class CacheMetadata {
 
-    /**
-     * The cached data instance which creates this container
-     */
-    private final AbstractCachedDataManager parentContainer;
-
     /**
      * The type of the object which owns the cache
      */
@@ -55,17 +50,12 @@ public class CacheMetadata {
      */
     private final QueryOptions queryOptions;
 
-    public CacheMetadata(AbstractCachedDataManager parentContainer, HolderType holderType, String objectName, QueryOptions queryOptions) {
-        this.parentContainer = parentContainer;
+    public CacheMetadata(HolderType holderType, String objectName, QueryOptions queryOptions) {
         this.holderType = holderType;
         this.objectName = objectName;
         this.queryOptions = queryOptions;
     }
 
-    public AbstractCachedDataManager getParentContainer() {
-        return this.parentContainer;
-    }
-
     public HolderType getHolderType() {
         return this.holderType;
     }
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java
index 5189cb414..3bb2fec91 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedDataManager.java
@@ -42,6 +42,6 @@ public class GroupCachedDataManager extends HolderCachedDataManager<Group> imple
 
     @Override
     protected CacheMetadata getMetadataForQueryOptions(QueryOptions queryOptions) {
-        return new CacheMetadata(this, HolderType.GROUP, this.holder.getPlainDisplayName(), queryOptions);
+        return new CacheMetadata(HolderType.GROUP, this.holder.getPlainDisplayName(), queryOptions);
     }
 }
diff --git a/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java b/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java
index 727ea782c..49c055ecf 100644
--- a/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedDataManager.java
@@ -42,6 +42,6 @@ public class UserCachedDataManager extends HolderCachedDataManager<User> impleme
 
     @Override
     protected CacheMetadata getMetadataForQueryOptions(QueryOptions queryOptions) {
-        return new CacheMetadata(this, HolderType.USER, this.holder.getPlainDisplayName(), queryOptions);
+        return new CacheMetadata(HolderType.USER, this.holder.getPlainDisplayName(), queryOptions);
     }
 }
diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java
index 10800d5ef..5d09d6066 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/model/calculated/CalculatedSubjectCachedDataManager.java
@@ -64,7 +64,7 @@ public class CalculatedSubjectCachedDataManager extends AbstractCachedDataManage
 
     @Override
     protected CacheMetadata getMetadataForQueryOptions(QueryOptions queryOptions) {
-        return new CacheMetadata(this, null, this.subject.getParentCollection().getIdentifier() + "/" + this.subject.getIdentifier(), queryOptions);
+        return new CacheMetadata(null, this.subject.getParentCollection().getIdentifier() + "/" + this.subject.getIdentifier(), queryOptions);
     }
 
     @Override