aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-ce
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2018-06-21 15:26:30 +0200
committersonartech <sonartech@sonarsource.com>2018-06-29 09:10:14 +0200
commit444d5b4d5dcd12123e5b993c92bf61bdd8097872 (patch)
treef0f1e54545b7063ef9d8477d99b2c40b099fdbe9 /server/sonar-ce
parent119cacc37ed66c5fcf08c7a3bf4197db79c58c39 (diff)
downloadsonarqube-444d5b4d5dcd12123e5b993c92bf61bdd8097872.tar.gz
sonarqube-444d5b4d5dcd12123e5b993c92bf61bdd8097872.zip
move classes around to prepare creation of sonar-ce-task module
Diffstat (limited to 'server/sonar-ce')
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java4
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java4
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java2
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java2
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java20
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java3
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java3
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java4
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java4
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java4
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java2
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskLoggingWorkerExecutionListenerTest.java (renamed from server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListenerTest.java)18
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java4
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java4
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java2
15 files changed, 42 insertions, 38 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java b/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java
index c708076d72a..e2a6de90f34 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/CeConfigurationModule.java
@@ -20,7 +20,7 @@
package org.sonar.ce;
import org.sonar.ce.configuration.CeConfigurationImpl;
-import org.sonar.ce.log.CeLogging;
+import org.sonar.server.computation.log.CeTaskLogging;
import org.sonar.ce.monitoring.CeDatabaseMBeanImpl;
import org.sonar.core.platform.Module;
import org.sonar.process.systeminfo.JvmPropertiesSection;
@@ -32,7 +32,7 @@ public class CeConfigurationModule extends Module {
protected void configureModule() {
add(
CeConfigurationImpl.class,
- CeLogging.class,
+ CeTaskLogging.class,
CeDatabaseMBeanImpl.class,
new JvmStateSection("Compute Engine JVM State"),
new JvmPropertiesSection("Compute Engine JVM Properties"),
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java b/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java
index 387ab0fd67e..9c5cbea5aaa 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListener.java
@@ -23,8 +23,8 @@ import javax.annotation.Nullable;
import org.sonar.api.resources.Qualifiers;
import org.sonar.api.resources.Scopes;
import org.sonar.api.utils.System2;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.queue.CeTaskResult;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import org.sonar.ce.taskprocessor.CeWorker;
import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java
index 1b11906750b..012ecd6dc3c 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueue.java
@@ -23,6 +23,8 @@ import java.util.Optional;
import java.util.Set;
import javax.annotation.Nullable;
import org.sonar.db.ce.CeActivityDto.Status;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
/**
* Queue of pending Compute Engine tasks. Both producer and consumer actions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java
index 76ed4abf0a6..4117f810407 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/queue/InternalCeQueueImpl.java
@@ -40,6 +40,8 @@ import org.sonar.db.DbSession;
import org.sonar.db.ce.CeActivityDto;
import org.sonar.db.ce.CeQueueDao;
import org.sonar.db.ce.CeQueueDto;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import org.sonar.server.computation.task.step.TypedException;
import org.sonar.server.organization.DefaultOrganizationProvider;
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java
index 3d7f8bb3ca5..34630cd54bd 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListener.java
@@ -20,29 +20,29 @@
package org.sonar.ce.taskprocessor;
import javax.annotation.Nullable;
-import org.sonar.ce.log.CeLogging;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.queue.CeTaskResult;
+import org.sonar.server.computation.log.CeTaskLogging;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import org.sonar.db.ce.CeActivityDto;
/**
- * {@link CeWorker.ExecutionListener} responsible of calling {@link CeLogging#initForTask(CeTask)} and
- * {@link CeLogging#clearForTask()}.
+ * {@link CeWorker.ExecutionListener} responsible of calling {@link CeTaskLogging#initForTask(CeTask)} and
+ * {@link CeTaskLogging#clearForTask()}.
*/
public class CeLoggingWorkerExecutionListener implements CeWorker.ExecutionListener {
- private final CeLogging ceLogging;
+ private final CeTaskLogging ceTaskLogging;
- public CeLoggingWorkerExecutionListener(CeLogging ceLogging) {
- this.ceLogging = ceLogging;
+ public CeLoggingWorkerExecutionListener(CeTaskLogging ceTaskLogging) {
+ this.ceTaskLogging = ceTaskLogging;
}
@Override
public void onStart(CeTask ceTask) {
- ceLogging.initForTask(ceTask);
+ ceTaskLogging.initForTask(ceTask);
}
@Override
public void onEnd(CeTask ceTask, CeActivityDto.Status status, @Nullable CeTaskResult taskResult, @Nullable Throwable error) {
- ceLogging.clearForTask();
+ ceTaskLogging.clearForTask();
}
}
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java
index 7663c105af7..cadfd400e4e 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepository.java
@@ -20,8 +20,7 @@
package org.sonar.ce.taskprocessor;
import java.util.Optional;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.taskprocessor.CeTaskProcessor;
+import org.sonar.server.computation.CeTask;
public interface CeTaskProcessorRepository {
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java
index d4a44abd843..99e2aeb845e 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImpl.java
@@ -29,8 +29,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Optional;
import javax.annotation.Nonnull;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.taskprocessor.CeTaskProcessor;
+import org.sonar.server.computation.CeTask;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.FluentIterable.from;
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java
index c7309fd5309..c257ecef19e 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorker.java
@@ -22,8 +22,8 @@ package org.sonar.ce.taskprocessor;
import java.util.concurrent.Callable;
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.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import org.sonar.db.ce.CeActivityDto;
/**
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java
index bf308183aee..2ed412a6a12 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java
@@ -28,8 +28,8 @@ import javax.annotation.Nullable;
import org.sonar.api.utils.MessageException;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.queue.CeTaskResult;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import org.sonar.ce.queue.InternalCeQueue;
import org.sonar.core.util.logs.Profiler;
import org.sonar.db.ce.CeActivityDto;
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java
index 749b93e7b3d..574e2fdf133 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java
@@ -29,8 +29,8 @@ import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
import org.sonar.api.notifications.Notification;
import org.sonar.api.utils.System2;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.queue.CeTaskResult;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import org.sonar.db.DbClient;
import org.sonar.db.DbTester;
import org.sonar.db.RowNotFoundException;
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java
index 1aab3f25bfc..15f76d2f131 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java
@@ -44,6 +44,8 @@ import org.sonar.db.ce.CeTaskTypes;
import org.sonar.db.component.ComponentDto;
import org.sonar.db.component.ComponentTesting;
import org.sonar.db.organization.OrganizationDto;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import org.sonar.server.computation.task.step.TypedException;
import org.sonar.server.organization.DefaultOrganization;
import org.sonar.server.organization.DefaultOrganizationProvider;
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListenerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskLoggingWorkerExecutionListenerTest.java
index 4c2e81aaf58..fc80542b72f 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeLoggingWorkerExecutionListenerTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskLoggingWorkerExecutionListenerTest.java
@@ -22,17 +22,17 @@ package org.sonar.ce.taskprocessor;
import java.util.Random;
import org.junit.Test;
import org.mockito.Mockito;
-import org.sonar.ce.log.CeLogging;
-import org.sonar.ce.queue.CeTask;
+import org.sonar.server.computation.log.CeTaskLogging;
+import org.sonar.server.computation.CeTask;
import org.sonar.db.ce.CeActivityDto;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-public class CeLoggingWorkerExecutionListenerTest {
- private CeLogging ceLogging = Mockito.spy(CeLogging.class);
- private CeLoggingWorkerExecutionListener underTest = new CeLoggingWorkerExecutionListener(ceLogging);
+public class CeTaskLoggingWorkerExecutionListenerTest {
+ private CeTaskLogging ceTaskLogging = Mockito.spy(CeTaskLogging.class);
+ private CeLoggingWorkerExecutionListener underTest = new CeLoggingWorkerExecutionListener(ceTaskLogging);
@Test
public void onStart_calls_initForTask_with_method_argument() {
@@ -40,8 +40,8 @@ public class CeLoggingWorkerExecutionListenerTest {
underTest.onStart(ceTask);
- verify(ceLogging).initForTask(ceTask);
- verifyNoMoreInteractions(ceLogging);
+ verify(ceTaskLogging).initForTask(ceTask);
+ verifyNoMoreInteractions(ceTaskLogging);
}
@Test
@@ -50,7 +50,7 @@ public class CeLoggingWorkerExecutionListenerTest {
CeActivityDto.Status.values()[new Random().nextInt(CeActivityDto.Status.values().length)],
null, null);
- verify(ceLogging).clearForTask();
- verifyNoMoreInteractions(ceLogging);
+ verify(ceTaskLogging).clearForTask();
+ verifyNoMoreInteractions(ceTaskLogging);
}
}
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java
index adef629f7d5..d5691e1bb08 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryImplTest.java
@@ -24,8 +24,8 @@ import java.util.Set;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.queue.CeTaskResult;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java
index ef548c02ff4..075c5deae31 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeTaskProcessorRepositoryRule.java
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import org.junit.rules.ExternalResource;
-import org.sonar.ce.queue.CeTask;
-import org.sonar.ce.queue.CeTaskResult;
+import org.sonar.server.computation.CeTask;
+import org.sonar.server.computation.CeTaskResult;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
index 365340a59a8..bd39488a6bf 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java
@@ -35,7 +35,7 @@ import org.mockito.Mockito;
import org.sonar.api.utils.MessageException;
import org.sonar.api.utils.log.LogTester;
import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.ce.queue.CeTask;
+import org.sonar.server.computation.CeTask;
import org.sonar.ce.queue.InternalCeQueue;
import org.sonar.db.ce.CeActivityDto;
import org.sonar.db.ce.CeTaskTypes;
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-30 03:43:19 +0000