Now using latest version of LabCommons. Optimized Identity entity, now using a SimpleMapConvertible extension

Author: MichealAPI

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>it.mikeslab</groupId>
     <artifactId>Identity</artifactId>
-    <version>2.0.4.4</version>
+    <version>2.0.4.5</version>
     <packaging>jar</packaging>
 
     <name>Identity</name>
@@ -181,7 +181,7 @@
         <dependency>
             <groupId>it.mikeslab</groupId>
             <artifactId>LabCommons</artifactId>
-            <version>2.4.1.4.4</version>
+            <version>2.4.1.5.2</version>
             <scope>provided</scope>
         </dependency>
 

src/main/java/it/mikeslab/identity/command/IdentityCommand.java

@@ -74,7 +74,7 @@ public void reset(CommandSender sender, OnlinePlayer target) {
         Identity filterIdentity = new Identity(); // this format nulls values
                                                   // and prevents its empty content
                                                   // from being queries inside the database
-        filterIdentity.setUuid(targetUUID);
+        filterIdentity.setUniqueId(targetUUID);
 
         Component resetMessage = instance.getLanguage().getComponent(
                 LanguageKey.IDENTITY_RESET_FOR,

src/main/java/it/mikeslab/identity/handler/IdentityCacheHandler.java

@@ -71,7 +71,7 @@ public CompletableFuture<Optional<Identity>> getCachedIdentity(UUID uuid) {
     public CompletableFuture<Identity> loadIdentity(UUID uuid) {
 
         Identity identityFilter = new Identity(); // todo new Identity(targetUUID);, but it requires values to be null!
-        identityFilter.setUuid(uuid);
+        identityFilter.setUniqueId(uuid);
 
         return this.identityDatabase.findOne(identityFilter);
 

src/main/java/it/mikeslab/identity/pojo/Identity.java

@@ -1,81 +1,24 @@
 package it.mikeslab.identity.pojo;
 
 
-import it.mikeslab.commons.api.database.SerializableMapConvertible;
-import it.mikeslab.commons.api.logger.LogUtils;
+import it.mikeslab.commons.api.database.util.SimpleMapConvertible;
 import it.mikeslab.identity.IdentityPlugin;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.*;
+import java.util.Set;
+import java.util.UUID;
 
-@Data
 @NoArgsConstructor
-public class Identity implements SerializableMapConvertible<Identity> {
+public class Identity extends SimpleMapConvertible<UUID, Identity> {
 
-    private Map<String, Object> values;
-    private UUID uuid; // mandatory
-
-    // Creates a filter for the identity
-    public Identity(UUID uuid) {
-        this.uuid = uuid;
-        this.values = new HashMap<>();
-    }
-
-    @Override
-    public Identity fromMap(Map<String, Object> map) {
-
-        Identity identity = new Identity();
-
-        if (map != null) {
-
-            identity.setValues(new HashMap<>(map));
-
-            LogUtils.debug(
-                    LogUtils.LogSource.DATABASE,
-                    "Retrieved values from Database: " + map.toString()
-            );
-
-            identity.getValues().remove(this.getUniqueIdentifierName());
-        }
-
-        return identity;
-    }
-
-
-
-    @Override
-    public Map<String, Object> toMap() {
-
-        Map<String, Object> map = new HashMap<>();
-
-        map.put(
-                this.getUniqueIdentifierName(),
-                this.getUniqueIdentifierValue()
-        );
-
-        if (values != null && !values.isEmpty()) {
-            LogUtils.debug(
-                    LogUtils.LogSource.DATABASE,
-                    "Populating a map based on a Identity POJO instance which contains: " + values.toString()
-            );
-            map.putAll(values);
-        }
-
-        return map;
-
-    }
-
-    @Override
-    public String getUniqueIdentifierName() {
-        return "uuid";
-    }
-
-    @Override
-    public Object getUniqueIdentifierValue() {
-        return uuid.toString();
+    public Identity(UUID referenceUUID) {
+        super(referenceUUID, "uuid");
     }
 
+    /*
+     * Authorized key values for the Identity entity
+     */
     @Override
     public Set<String> identifiers() {
         return IdentityPlugin.INVENTORY_IDENTIFIERS;