Browse Source

Remove task.getKey()

pull/13285/head
ViacheslavKlimov 1 year ago
parent
commit
1e5b6cc9a9
  1. 5
      common/data/src/main/java/org/thingsboard/server/common/data/job/task/DummyTask.java
  2. 4
      common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
  3. 4
      common/queue/src/main/java/org/thingsboard/server/queue/task/TaskProcessor.java

5
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);

4
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();

4
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);

Loading…
Cancel
Save