Fixed order of retrieving data from bytestream, improved naming, adding logging

plugin/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
 tasks {
 
     jar {
-        enabled = false
+        enabled = true
     }
 
     shadowJar {

plugin/src/main/java/com/alttd/datalock/DataLock.java

@@ -5,8 +5,8 @@ import com.google.common.io.ByteStreams;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.UUID;
+import java.util.logging.Level;
 
 public class DataLock implements DataLockAPI {
 
@@ -35,7 +35,9 @@ public class DataLock implements DataLockAPI {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF(requestType.subChannel);
         out.writeUTF(idempotencyData.data());
+        out.writeUTF(idempotencyData.idempotencyToken().toString());
         plugin.getServer().sendPluginMessage(plugin, idempotencyData.channel(), out.toByteArray());
+        DataLockLib.getInstance().getLogger().log(Level.INFO, "Send plugin message on [" + requestType.subChannel + "] about data: [" + idempotencyData.data() + "]");
     }
 
     private final HashSet<String> activeChannels = new HashSet<>();
@@ -74,8 +76,8 @@ public class DataLock implements DataLockAPI {
         @Override
         public void run() {
             for (RequestType requestType : RequestType.values()) {
-                for (IdempotencyData next : activeRequests.getIdempotencyData(requestType)) {
-                    sendPluginMessage(requestType, next);
+                for (IdempotencyData idempotencyData : activeRequests.getIdempotencyData(requestType)) {
+                    sendPluginMessage(requestType, idempotencyData);
                 }
             }
         }

plugin/src/main/java/com/alttd/datalock/PluginMessageListener.java

@@ -7,6 +7,7 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
+import java.util.logging.Level;
 
 class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessageListener {
 
@@ -23,14 +24,16 @@ class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessage
             return;
         }
         ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
-        String data = in.readUTF();
+        String subChannel = in.readUTF();
         boolean result = in.readBoolean();
+        String data = in.readUTF();
         UUID idempotency = UUID.fromString(in.readUTF());
         IdempotencyData idempotencyData = new IdempotencyData(channel, data, idempotency);
+        DataLockLib.getInstance().getLogger().log(Level.INFO, "Received plugin message on [" + subChannel + "] about data: [" + data + "]");
         new BukkitRunnable() {
             @Override
             public void run() {
-                switch (in.readUTF()) {
+                switch (subChannel) {
                     case "try-lock-result" -> {
                         if (!alreadyReceived.putIdempotencyData(RequestType.TRY_LOCK, idempotencyData))
                             return;