From 6a9143708a691ebe71348fa40665b32f9048b76f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 28 Mar 2017 17:18:48 +0200 Subject: [PATCH] SONAR-8985 remove dead CeQueueInternal#cancel(DbSession, CeQueueDto) --- .../src/main/java/org/sonar/ce/queue/CeQueueImpl.java | 2 +- .../org/sonar/server/computation/queue/InternalCeQueue.java | 4 ---- .../sonar/server/computation/queue/InternalCeQueueImpl.java | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java b/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java index a78c09090ba..9226758c2cd 100644 --- a/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/ce/queue/CeQueueImpl.java @@ -133,7 +133,7 @@ public class CeQueueImpl implements CeQueue { } } - protected void cancelImpl(DbSession dbSession, CeQueueDto q) { + private void cancelImpl(DbSession dbSession, CeQueueDto q) { CeActivityDto activityDto = new CeActivityDto(q); activityDto.setStatus(CeActivityDto.Status.CANCELED); remove(dbSession, q, activityDto); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueue.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueue.java index 265e314224b..f06d997fa64 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueue.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueue.java @@ -24,9 +24,7 @@ import javax.annotation.Nullable; import org.sonar.ce.queue.CeQueue; import org.sonar.ce.queue.CeTask; import org.sonar.ce.queue.CeTaskResult; -import org.sonar.db.DbSession; import org.sonar.db.ce.CeActivityDto.Status; -import org.sonar.db.ce.CeQueueDto; /** * Queue of pending Compute Engine tasks. Both producer and consumer actions @@ -70,8 +68,6 @@ public interface InternalCeQueue extends CeQueue { */ void remove(CeTask task, Status status, @Nullable CeTaskResult taskResult, @Nullable Throwable error); - void cancel(DbSession dbSession, CeQueueDto ceQueueDto); - void pausePeek(); void resumePeek(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueueImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueueImpl.java index 566843818a0..869dc970f09 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueueImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/queue/InternalCeQueueImpl.java @@ -153,11 +153,6 @@ public class InternalCeQueueImpl extends CeQueueImpl implements InternalCeQueue } } - @Override - public void cancel(DbSession dbSession, CeQueueDto ceQueueDto) { - cancelImpl(dbSession, ceQueueDto); - } - @Override public void pausePeek() { this.peekPaused.set(true); -- 2.39.5