From 1e5b6cc9a9cfe50bae5fb1db30c09bd25f9b151c Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Mon, 5 May 2025 15:45:56 +0300
Subject: [PATCH] Remove task.getKey()

---
 .../thingsboard/server/common/data/job/task/DummyTask.java   | 5 -----
 .../org/thingsboard/server/common/data/job/task/Task.java    | 4 ----
 .../org/thingsboard/server/queue/task/TaskProcessor.java     | 4 ++--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/DummyTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/DummyTask.java
index 39e1306597..d7a37b5175 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/DummyTask.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/DummyTask.java
@@ -36,11 +36,6 @@ public class DummyTask extends Task<DummyTaskResult> {
     private List<String> errors; // errors for each attempt
     private boolean failAlways;
 
-    @Override
-    public Object getKey() {
-        return number;
-    }
-
     @Override
     public DummyTaskResult toFailed(Throwable error) {
         return DummyTaskResult.failed(this, error);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
index 624c5e90f8..6bf287b54a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.job.task;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
@@ -46,9 +45,6 @@ public abstract class Task<R extends TaskResult> {
 
     private int attempt = 0;
 
-    @JsonIgnore
-    public abstract Object getKey();
-
     public abstract R toFailed(Throwable error);
 
     public abstract R toDiscarded();
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/task/TaskProcessor.java b/common/queue/src/main/java/org/thingsboard/server/queue/task/TaskProcessor.java
index 30a9929dfb..38d3d02b50 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/task/TaskProcessor.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/task/TaskProcessor.java
@@ -115,11 +115,11 @@ public abstract class TaskProcessor<T extends Task<R>, R extends TaskResult> {
                 @SuppressWarnings("unchecked")
                 T task = (T) JacksonUtil.fromString(msg.getValue().getValue(), Task.class);
                 if (discardedJobs.contains(task.getJobId().getId())) {
-                    log.info("Skipping task '{}' for cancelled job {}", task.getKey(), task.getJobId());
+                    log.debug("Skipping task for cancelled job {}: {}", task.getJobId(), task);
                     reportTaskDiscarded(task);
                     continue;
                 } else if (deletedTenants.contains(task.getTenantId().getId())) {
-                    log.info("Skipping task '{}' for deleted tenant {}", task.getKey(), task.getTenantId());
+                    log.debug("Skipping task for deleted tenant {}: {}", task.getTenantId(), task);
                     continue;
                 }
                 processTask(task);