SONAR-8985 remove dead CeQueueInternal#cancel(DbSession, CeQueueDto)

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 a78c09090badeb4b6b54153f187836ff38c201c3..9226758c2cd0d60f09b1e4881edd147e0bf72d29 100644 (file)
--- 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 265e314224bc59e6c7f64f2e46143df5a4d6ecbc..f06d997fa64af447c57c75e1090ec20b7978ba0f 100644 (file)
--- 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 566843818a06ab140ce56f9e2b5c24e111c476d6..869dc970f09e332acf3329f967d40bc694cb8962 100644 (file)
--- 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);