From 487e90555204c8e656c775efce91c90e98d90e36 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 5 Mar 2013 16:22:31 +0100 Subject: [PATCH] Revert "SONAR-4069 Remove Task and TaskDefinition from API." This reverts commit 7509fbafb262c92c3603d5b17387c232a5748327. --- .../java/org/sonar/batch/bootstrap/ExtensionInstaller.java | 2 +- .../org/sonar/batch/bootstrap/TaskBootstrapContainer.java | 2 +- .../main/java/org/sonar/batch/bootstrap/TaskContainer.java | 4 ++-- .../src/main/java/org/sonar/batch/scan/ScanTask.java | 4 ++-- .../src/main/java/org/sonar/batch/tasks/ListTasksTask.java | 3 +++ sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java | 2 ++ .../org/sonar/batch/bootstrap/ExtensionInstallerTest.java | 2 +- .../java/org/sonar/batch/bootstrap/TaskContainerTest.java | 2 +- .../test/java/org/sonar/batch/tasks/ListTasksTaskTest.java | 1 + .../src/test/java/org/sonar/batch/tasks/TasksTest.java | 2 ++ .../src/main/java/org/sonar/api/task}/Task.java | 4 +--- .../src/main/java/org/sonar/api/task/TaskComponent.java | 6 ++---- .../src/main/java/org/sonar/api/task}/TaskDefinition.java | 4 +--- .../src/main/java/org/sonar/api/task/TaskExtension.java | 4 +--- 14 files changed, 21 insertions(+), 21 deletions(-) rename {sonar-batch/src/main/java/org/sonar/batch/tasks => sonar-plugin-api/src/main/java/org/sonar/api/task}/Task.java (93%) rename {sonar-batch/src/main/java/org/sonar/batch/tasks => sonar-plugin-api/src/main/java/org/sonar/api/task}/TaskDefinition.java (96%) diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java index a6833247022..211128bde2f 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java @@ -31,7 +31,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.platform.ComponentContainer; import org.sonar.api.platform.PluginMetadata; import org.sonar.api.resources.Project; -import org.sonar.batch.tasks.TaskDefinition; +import org.sonar.api.task.TaskDefinition; import org.sonar.batch.bootstrapper.EnvironmentInformation; import javax.annotation.Nullable; diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java index ae0b36a5020..39a81ebffdb 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskBootstrapContainer.java @@ -20,7 +20,7 @@ package org.sonar.batch.bootstrap; import org.sonar.api.batch.bootstrap.ProjectReactor; -import org.sonar.batch.tasks.TaskDefinition; +import org.sonar.api.task.TaskDefinition; import org.sonar.api.utils.SonarException; import org.sonar.batch.scan.ScanTask; import org.sonar.batch.tasks.ListTasksTask; diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java index 6158d3b02f1..9c4e23c0a22 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java @@ -23,8 +23,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.config.EmailSettings; import org.sonar.api.resources.ResourceTypes; -import org.sonar.batch.tasks.Task; -import org.sonar.batch.tasks.TaskDefinition; +import org.sonar.api.task.Task; +import org.sonar.api.task.TaskDefinition; import org.sonar.api.utils.SonarException; import org.sonar.batch.DefaultFileLinesContextFactory; import org.sonar.batch.DefaultResourceCreationLock; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ScanTask.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ScanTask.java index f9e03d977d9..f007e92749d 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ScanTask.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ScanTask.java @@ -22,8 +22,8 @@ package org.sonar.batch.scan; import com.google.common.annotations.VisibleForTesting; import org.sonar.api.platform.ComponentContainer; import org.sonar.api.resources.Project; -import org.sonar.batch.tasks.Task; -import org.sonar.batch.tasks.TaskDefinition; +import org.sonar.api.task.Task; +import org.sonar.api.task.TaskDefinition; import org.sonar.batch.ProjectTree; import org.sonar.batch.tasks.RequiresProject; diff --git a/sonar-batch/src/main/java/org/sonar/batch/tasks/ListTasksTask.java b/sonar-batch/src/main/java/org/sonar/batch/tasks/ListTasksTask.java index 50b8dbb7090..dd08729b2cf 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/tasks/ListTasksTask.java +++ b/sonar-batch/src/main/java/org/sonar/batch/tasks/ListTasksTask.java @@ -19,6 +19,9 @@ */ package org.sonar.batch.tasks; +import org.sonar.api.task.Task; +import org.sonar.api.task.TaskDefinition; + public class ListTasksTask implements Task { public static final String COMMAND = "list-tasks"; diff --git a/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java b/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java index 1af4cf6f143..82af633c54b 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java +++ b/sonar-batch/src/main/java/org/sonar/batch/tasks/Tasks.java @@ -24,7 +24,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; +import org.sonar.api.task.Task; import org.sonar.api.task.TaskComponent; +import org.sonar.api.task.TaskDefinition; import org.sonar.api.utils.SonarException; import org.sonar.batch.scan.ScanTask; diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java index 51c9c8b6750..ce31e79b46e 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java @@ -32,7 +32,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.platform.ComponentContainer; import org.sonar.api.platform.PluginMetadata; import org.sonar.api.resources.Project; -import org.sonar.batch.tasks.TaskDefinition; +import org.sonar.api.task.TaskDefinition; import org.sonar.api.task.TaskExtension; import org.sonar.batch.bootstrapper.EnvironmentInformation; import org.sonar.batch.tasks.RequiresProject; diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskContainerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskContainerTest.java index 9fae435cb0b..03944ea0d77 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskContainerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/TaskContainerTest.java @@ -21,7 +21,7 @@ package org.sonar.batch.bootstrap; import org.junit.Test; import org.sonar.api.platform.ComponentContainer; -import org.sonar.batch.tasks.TaskDefinition; +import org.sonar.api.task.TaskDefinition; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/sonar-batch/src/test/java/org/sonar/batch/tasks/ListTasksTaskTest.java b/sonar-batch/src/test/java/org/sonar/batch/tasks/ListTasksTaskTest.java index d4a91ab36ca..d66c0c688ed 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/tasks/ListTasksTaskTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/tasks/ListTasksTaskTest.java @@ -20,6 +20,7 @@ package org.sonar.batch.tasks; import org.junit.Test; +import org.sonar.api.task.TaskDefinition; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/sonar-batch/src/test/java/org/sonar/batch/tasks/TasksTest.java b/sonar-batch/src/test/java/org/sonar/batch/tasks/TasksTest.java index de478c23cf3..102576ec196 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/tasks/TasksTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/tasks/TasksTest.java @@ -25,6 +25,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; +import org.sonar.api.task.Task; +import org.sonar.api.task.TaskDefinition; import org.sonar.api.utils.SonarException; import org.sonar.batch.scan.ScanTask; diff --git a/sonar-batch/src/main/java/org/sonar/batch/tasks/Task.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java similarity index 93% rename from sonar-batch/src/main/java/org/sonar/batch/tasks/Task.java rename to sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java index 26b583efb77..42bfdddcaac 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/tasks/Task.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/Task.java @@ -17,11 +17,9 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.batch.tasks; +package org.sonar.api.task; -import org.sonar.api.task.TaskExtension; - /** * Implement this interface to provide the behavior of a task. * @since 3.5 diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java index 3640ac79475..346b8bcf351 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskComponent.java @@ -19,13 +19,11 @@ */ package org.sonar.api.task; -import com.google.common.annotations.Beta; - /** - * EXPERIMENTAL - DO NOT USE + * Dependency Injection : all the classes implementing this interface are available in the task IoC container. + * Just add a parameter to the constructor of your component. * * @since 3.5 */ -@Beta public interface TaskComponent { } diff --git a/sonar-batch/src/main/java/org/sonar/batch/tasks/TaskDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java similarity index 96% rename from sonar-batch/src/main/java/org/sonar/batch/tasks/TaskDefinition.java rename to sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java index aea3ddaa56e..2d7d595bd78 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/tasks/TaskDefinition.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskDefinition.java @@ -17,9 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.batch.tasks; - -import org.sonar.api.task.TaskComponent; +package org.sonar.api.task; /** * Implement this interface to provide a new task. diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java index 854f94e3824..92c3c7230de 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/task/TaskExtension.java @@ -19,14 +19,12 @@ */ package org.sonar.api.task; -import com.google.common.annotations.Beta; import org.sonar.api.Extension; /** - * EXPERIMENTAL - DO NOT USE + * Task extension point. * * @since 3.5 */ -@Beta public interface TaskExtension extends Extension, TaskComponent { } -- 2.39.5