container.addSingleton(DefaultUserFinder.class);
container.addSingleton(ResourceTypes.class);
container.addSingleton(SemaphoresImpl.class);
+ container.addSingleton(MetricProvider.class);
}
private void registerDatabaseComponents() {
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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.bootstrap;
-
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.resources.Project;
-
-public class AnalyseProjectModule extends Module {
-
- private Project rootProject;
-
- public AnalyseProjectModule(Project rootProject) {
- this.rootProject = rootProject;
- }
-
- @Override
- protected void configure() {
- container.addSingleton(MetricProvider.class);
-
- registerPerBatchExtensions();
- }
-
- private void registerPerBatchExtensions() {
- ExtensionInstaller installer = container.getComponentByType(ExtensionInstaller.class);
- installer.installBatchExtensions(container, InstantiationStrategy.PER_BATCH);
- }
-
- /**
- * Analyze project
- */
- @Override
- protected void doStart() {
- analyze(rootProject);
- }
-
- private void analyze(Project project) {
- for (Project subProject : project.getModules()) {
- analyze(subProject);
- }
-
- ProjectModule projectModule = new ProjectModule(project);
- try {
- installChild(projectModule);
- projectModule.start();
- } finally {
- projectModule.stop();
- uninstallChild();
- }
- }
-}
*/
package org.sonar.batch.bootstrap;
+import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.BatchComponent;
}
public void installTaskExtensions(ComponentContainer container, boolean projectPresent) {
+ boolean dryRun = settings.getBoolean(CoreProperties.DRY_RUN);
for (Map.Entry<PluginMetadata, Plugin> entry : pluginRepository.getPluginsByMetadata().entrySet()) {
PluginMetadata metadata = entry.getKey();
Plugin plugin = entry.getValue();
container.addExtension(metadata, plugin);
for (Object extension : plugin.getExtensions()) {
installTaskExtension(container, metadata, extension, projectPresent);
+ if (projectPresent) {
+ installBatchExtension(container, metadata, extension, dryRun, InstantiationStrategy.PER_BATCH);
+ }
}
}
List<ExtensionProvider> providers = container.getComponentsByType(ExtensionProvider.class);
for (ExtensionProvider provider : providers) {
executeTaskExtensionProvider(container, provider, projectPresent);
+ if (projectPresent) {
+ executeBatchExtensionProvider(container, InstantiationStrategy.PER_BATCH, dryRun, provider);
+ }
}
}
return installed;
}
- public void installBatchExtensions(ComponentContainer container, String instantiationStrategy) {
+ public void installInspectionExtensions(ComponentContainer container) {
+ installBatchExtensions(container, InstantiationStrategy.PER_PROJECT);
+ }
+
+ @VisibleForTesting
+ void installBatchExtensions(ComponentContainer container, String instantiationStrategy) {
boolean dryRun = settings.getBoolean(CoreProperties.DRY_RUN);
for (Map.Entry<PluginMetadata, Plugin> entry : pluginRepository.getPluginsByMetadata().entrySet()) {
PluginMetadata metadata = entry.getKey();
import com.google.common.collect.Lists;
import org.slf4j.LoggerFactory;
-import org.sonar.api.BatchExtension;
import org.sonar.api.ExtensionProvider;
-import org.sonar.api.batch.InstantiationStrategy;
+import org.sonar.api.TaskExtension;
import org.sonar.api.measures.CoreMetrics;
import org.sonar.api.measures.Metric;
import org.sonar.api.measures.Metrics;
import java.util.List;
-@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
-public class MetricProvider extends ExtensionProvider implements BatchExtension {
+public class MetricProvider extends ExtensionProvider implements TaskExtension {
private Metrics[] factories;
*/
public abstract class Module {
- ComponentContainer container;
+ protected ComponentContainer container;
/**
* @return this
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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.bootstrap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchExtensionDictionnary;
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.bootstrap.ProjectDefinition;
-import org.sonar.api.profiles.RulesProfile;
-import org.sonar.api.resources.Languages;
-import org.sonar.api.resources.Project;
-import org.sonar.api.tests.ProjectTestsImpl;
-import org.sonar.batch.DefaultProfileLoader;
-import org.sonar.batch.DefaultProjectClasspath;
-import org.sonar.batch.DefaultProjectFileSystem2;
-import org.sonar.batch.DefaultSensorContext;
-import org.sonar.batch.DefaultTimeMachine;
-import org.sonar.batch.ProfileProvider;
-import org.sonar.batch.ProjectTree;
-import org.sonar.batch.ResourceFilters;
-import org.sonar.batch.ViolationFilters;
-import org.sonar.batch.components.TimeMachineConfiguration;
-import org.sonar.batch.events.EventBus;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.index.ResourcePersister;
-import org.sonar.batch.local.DryRunExporter;
-import org.sonar.batch.phases.Phases;
-import org.sonar.batch.phases.PhasesTimeProfiler;
-import org.sonar.core.qualitymodel.DefaultModelFinder;
-import org.sonar.jpa.dao.ProfilesDao;
-import org.sonar.jpa.dao.RulesDao;
-
-public class ProjectModule extends Module {
- private static final Logger LOG = LoggerFactory.getLogger(ProjectModule.class);
- private Project project;
-
- public ProjectModule(Project project) {
- this.project = project;
- }
-
- @Override
- protected void configure() {
- logSettings();
- addCoreComponents();
- addPluginExtensions();
- }
-
- private void addCoreComponents() {
- ProjectDefinition projectDefinition = container.getComponentByType(ProjectTree.class).getProjectDefinition(project);
- container.addSingleton(projectDefinition);
- container.addSingleton(project.getConfiguration());
- container.addSingleton(project);
- container.addSingleton(ProjectSettings.class);
-
- // hack to initialize commons-configuration before ExtensionProviders
- container.getComponentByType(ProjectSettings.class);
-
- container.addSingleton(EventBus.class);
- container.addSingleton(Phases.class);
- container.addSingleton(PhasesTimeProfiler.class);
- for (Class clazz : Phases.getPhaseClasses()) {
- container.addSingleton(clazz);
- }
- container.addSingleton(UnsupportedProperties.class);
-
- for (Object component : projectDefinition.getContainerExtensions()) {
- container.addSingleton(component);
- }
- container.addSingleton(Languages.class);
- container.addSingleton(DefaultProjectClasspath.class);
- container.addSingleton(DefaultProjectFileSystem2.class);
- container.addSingleton(RulesDao.class);
-
- // the Snapshot component will be removed when asynchronous measures are improved (required for AsynchronousMeasureSensor)
- container.addSingleton(container.getComponentByType(ResourcePersister.class).getSnapshot(project));
-
- container.addSingleton(TimeMachineConfiguration.class);
- container.addSingleton(org.sonar.api.database.daos.MeasuresDao.class);
- container.addSingleton(ProfilesDao.class);
- container.addSingleton(DefaultSensorContext.class);
- container.addSingleton(BatchExtensionDictionnary.class);
- container.addSingleton(DefaultTimeMachine.class);
- container.addSingleton(ViolationFilters.class);
- container.addSingleton(ResourceFilters.class);
- container.addSingleton(DefaultModelFinder.class);
- container.addSingleton(DefaultProfileLoader.class);
- container.addSingleton(DryRunExporter.class);
- container.addSingleton(ProjectTestsImpl.class);
- container.addPicoAdapter(new ProfileProvider());
- }
-
- private void addPluginExtensions() {
- ExtensionInstaller installer = container.getComponentByType(ExtensionInstaller.class);
- installer.installBatchExtensions(container, InstantiationStrategy.PER_PROJECT);
- }
-
- private void logSettings() {
- // TODO move these logs in a dedicated component
- LOG.info("------------- Analyzing {}", project.getName());
- }
-
- /**
- * Analyze project
- */
- @Override
- protected void doStart() {
- DefaultIndex index = container.getComponentByType(DefaultIndex.class);
- index.setCurrentProject(project,
- container.getComponentByType(ResourceFilters.class),
- container.getComponentByType(ViolationFilters.class),
- container.getComponentByType(RulesProfile.class));
-
- container.getComponentByType(Phases.class).execute(project);
- }
-}
container.addSingleton(DryRunDatabase.class);
}
+
}
import org.sonar.api.batch.TaskDefinition;
import org.sonar.api.batch.bootstrap.ProjectReactor;
import org.sonar.api.utils.SonarException;
-import org.sonar.batch.tasks.AnalyseProjectTaskDefinition;
+import org.sonar.batch.tasks.InspectionTaskDefinition;
import org.sonar.batch.tasks.ListTaskDefinition;
import org.sonar.batch.tasks.TaskManager;
}
private void registerCoreTaskDefinitions() {
- container.addSingleton(AnalyseProjectTaskDefinition.class);
+ container.addSingleton(InspectionTaskDefinition.class);
container.addSingleton(ListTaskDefinition.class);
}
@Override
protected void doStart() {
- String command = StringUtils.isNotBlank(taskCommand) ? taskCommand : AnalyseProjectTaskDefinition.COMMAND;
+ String command = StringUtils.isNotBlank(taskCommand) ? taskCommand : InspectionTaskDefinition.COMMAND;
TaskManager manager = container.getComponentByType(TaskManager.class);
executeTask(manager.getTask(command));
}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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.batch.TaskDefinition;
-import org.sonar.api.batch.TaskDescriptor;
-import org.sonar.api.batch.TaskExecutor;
-
-public class AnalyseProjectTaskDefinition implements TaskDefinition {
-
- public static final String COMMAND = "analyse-project";
-
- public TaskDescriptor getTaskDescriptor() {
- return TaskDescriptor.create()
- .setDescription("Start a Sonar analysis of a project")
- .setName("Sonar project analysis")
- .setCommand(COMMAND)
- .setRequiresProject(true);
- }
-
- public Class<? extends TaskExecutor> getExecutor() {
- return AnalyseProjectTaskExecutor.class;
- }
-
-}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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.batch.RequiresProject;
-import org.sonar.api.batch.TaskExecutor;
-import org.sonar.api.platform.ComponentContainer;
-import org.sonar.batch.ProjectTree;
-import org.sonar.batch.bootstrap.AnalyseProjectModule;
-
-@RequiresProject
-public class AnalyseProjectTaskExecutor implements TaskExecutor {
-
- private final ComponentContainer container;
- private final ProjectTree projectTree;
-
- public AnalyseProjectTaskExecutor(ProjectTree projectTree, ComponentContainer container) {
- this.container = container;
- this.projectTree = projectTree;
- }
-
- public void execute() {
- AnalyseProjectModule analyseProjectModule = new AnalyseProjectModule(projectTree.getRootProject());
- try {
- ComponentContainer childContainer = container.createChild();
- analyseProjectModule.init(childContainer);
- analyseProjectModule.start();
- } finally {
- analyseProjectModule.stop();
- container.removeChild();
- }
- }
-
-}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2012 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.sonar.api.batch.BatchExtensionDictionnary;
+import org.sonar.api.batch.bootstrap.ProjectDefinition;
+import org.sonar.api.profiles.RulesProfile;
+import org.sonar.api.resources.Languages;
+import org.sonar.api.resources.Project;
+import org.sonar.api.tests.ProjectTestsImpl;
+import org.sonar.batch.DefaultProfileLoader;
+import org.sonar.batch.DefaultProjectClasspath;
+import org.sonar.batch.DefaultProjectFileSystem2;
+import org.sonar.batch.DefaultSensorContext;
+import org.sonar.batch.DefaultTimeMachine;
+import org.sonar.batch.ProfileProvider;
+import org.sonar.batch.ProjectTree;
+import org.sonar.batch.ResourceFilters;
+import org.sonar.batch.ViolationFilters;
+import org.sonar.batch.bootstrap.ExtensionInstaller;
+import org.sonar.batch.bootstrap.Module;
+import org.sonar.batch.bootstrap.ProjectSettings;
+import org.sonar.batch.bootstrap.UnsupportedProperties;
+import org.sonar.batch.components.TimeMachineConfiguration;
+import org.sonar.batch.events.EventBus;
+import org.sonar.batch.index.DefaultIndex;
+import org.sonar.batch.index.ResourcePersister;
+import org.sonar.batch.local.DryRunExporter;
+import org.sonar.batch.phases.Phases;
+import org.sonar.batch.phases.PhasesTimeProfiler;
+import org.sonar.core.qualitymodel.DefaultModelFinder;
+import org.sonar.jpa.dao.ProfilesDao;
+import org.sonar.jpa.dao.RulesDao;
+
+public class InspectionModule extends Module {
+ private static final Logger LOG = LoggerFactory.getLogger(InspectionModule.class);
+ private Project project;
+
+ public InspectionModule(Project project) {
+ this.project = project;
+ }
+
+ @Override
+ protected void configure() {
+ logSettings();
+ addCoreComponents();
+ addPluginExtensions();
+ }
+
+ private void addCoreComponents() {
+ ProjectDefinition projectDefinition = container.getComponentByType(ProjectTree.class).getProjectDefinition(project);
+ container.addSingleton(projectDefinition);
+ container.addSingleton(project.getConfiguration());
+ container.addSingleton(project);
+ container.addSingleton(ProjectSettings.class);
+
+ // hack to initialize commons-configuration before ExtensionProviders
+ container.getComponentByType(ProjectSettings.class);
+
+ container.addSingleton(EventBus.class);
+ container.addSingleton(Phases.class);
+ container.addSingleton(PhasesTimeProfiler.class);
+ for (Class clazz : Phases.getPhaseClasses()) {
+ container.addSingleton(clazz);
+ }
+ container.addSingleton(UnsupportedProperties.class);
+
+ for (Object component : projectDefinition.getContainerExtensions()) {
+ container.addSingleton(component);
+ }
+ container.addSingleton(Languages.class);
+ container.addSingleton(DefaultProjectClasspath.class);
+ container.addSingleton(DefaultProjectFileSystem2.class);
+ container.addSingleton(RulesDao.class);
+
+ // the Snapshot component will be removed when asynchronous measures are improved (required for AsynchronousMeasureSensor)
+ container.addSingleton(container.getComponentByType(ResourcePersister.class).getSnapshot(project));
+
+ container.addSingleton(TimeMachineConfiguration.class);
+ container.addSingleton(org.sonar.api.database.daos.MeasuresDao.class);
+ container.addSingleton(ProfilesDao.class);
+ container.addSingleton(DefaultSensorContext.class);
+ container.addSingleton(BatchExtensionDictionnary.class);
+ container.addSingleton(DefaultTimeMachine.class);
+ container.addSingleton(ViolationFilters.class);
+ container.addSingleton(ResourceFilters.class);
+ container.addSingleton(DefaultModelFinder.class);
+ container.addSingleton(DefaultProfileLoader.class);
+ container.addSingleton(DryRunExporter.class);
+ container.addSingleton(ProjectTestsImpl.class);
+ container.addPicoAdapter(new ProfileProvider());
+ }
+
+ private void addPluginExtensions() {
+ ExtensionInstaller installer = container.getComponentByType(ExtensionInstaller.class);
+ installer.installInspectionExtensions(container);
+ }
+
+ private void logSettings() {
+ LOG.info("------------- Inspecting {}", project.getName());
+ }
+
+ /**
+ * Analyze project
+ */
+ @Override
+ protected void doStart() {
+ DefaultIndex index = container.getComponentByType(DefaultIndex.class);
+ index.setCurrentProject(project,
+ container.getComponentByType(ResourceFilters.class),
+ container.getComponentByType(ViolationFilters.class),
+ container.getComponentByType(RulesProfile.class));
+
+ container.getComponentByType(Phases.class).execute(project);
+ }
+}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2012 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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.batch.TaskDefinition;
+import org.sonar.api.batch.TaskDescriptor;
+import org.sonar.api.batch.TaskExecutor;
+
+public class InspectionTaskDefinition implements TaskDefinition {
+
+ public static final String COMMAND = "analyse-project";
+
+ public TaskDescriptor getTaskDescriptor() {
+ return TaskDescriptor.create()
+ .setDescription("Start a Sonar analysis of a project")
+ .setName("Sonar project analysis")
+ .setCommand(COMMAND)
+ .setRequiresProject(true);
+ }
+
+ public Class<? extends TaskExecutor> getExecutor() {
+ return InspectionTaskExecutor.class;
+ }
+
+}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2012 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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.batch.RequiresProject;
+import org.sonar.api.batch.TaskExecutor;
+import org.sonar.api.platform.ComponentContainer;
+import org.sonar.api.resources.Project;
+import org.sonar.batch.ProjectTree;
+
+@RequiresProject
+public class InspectionTaskExecutor implements TaskExecutor {
+
+ private final ComponentContainer container;
+ private final ProjectTree projectTree;
+
+ public InspectionTaskExecutor(ProjectTree projectTree, ComponentContainer container) {
+ this.container = container;
+ this.projectTree = projectTree;
+ }
+
+ public void execute() {
+ analyze(projectTree.getRootProject());
+ }
+
+ private void analyze(Project project) {
+ for (Project subProject : project.getModules()) {
+ analyze(subProject);
+ }
+
+ InspectionModule projectModule = new InspectionModule(project);
+ try {
+ ComponentContainer childContainer = container.createChild();
+ projectModule.init(childContainer);
+ projectModule.start();
+ } finally {
+ projectModule.stop();
+ container.removeChild();
+ }
+ }
+
+}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2012 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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.bootstrap;
+
+import org.junit.Test;
+import org.sonar.api.platform.ComponentContainer;
+import org.sonar.batch.tasks.ListTaskDefinition;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class AbstractTaskModuleTest {
+ @Test
+ public void should_register_task_extensions_when_project_present() {
+ final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class);
+ Module bootstrapModule = new Module() {
+ @Override
+ protected void configure() {
+ // used to install project extensions
+ container.addSingleton(extensionInstaller);
+ }
+ };
+ bootstrapModule.init();
+ ProjectTaskModule module = new ProjectTaskModule(new ListTaskDefinition());
+ bootstrapModule.installChild(module);
+
+ verify(extensionInstaller).installTaskExtensions(any(ComponentContainer.class), eq(true));
+ }
+
+ @Test
+ public void should_register_task_extensions_when_no_project() {
+ final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class);
+ Module bootstrapModule = new Module() {
+ @Override
+ protected void configure() {
+ // used to install project extensions
+ container.addSingleton(extensionInstaller);
+ }
+ };
+ bootstrapModule.init();
+ ProjectLessTaskModule module = new ProjectLessTaskModule(new ListTaskDefinition());
+ bootstrapModule.installChild(module);
+
+ verify(extensionInstaller).installTaskExtensions(any(ComponentContainer.class), eq(false));
+ }
+}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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.bootstrap;
-
-import org.junit.Test;
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.platform.ComponentContainer;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-public class AnalyseProjectModuleTest {
- @Test
- public void should_register_batch_extensions() {
- final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class);
- Module bootstrapModule = new Module() {
- @Override
- protected void configure() {
- // used to install project extensions
- container.addSingleton(extensionInstaller);
- }
- };
- bootstrapModule.init();
- AnalyseProjectModule module = new AnalyseProjectModule(null);
- bootstrapModule.installChild(module);
-
- verify(extensionInstaller).installBatchExtensions(any(ComponentContainer.class), eq(InstantiationStrategy.PER_BATCH));
- }
-}
ComponentContainer container = new ComponentContainer();
ExtensionInstaller installer = new ExtensionInstaller(pluginRepository, new EnvironmentInformation("ant", "1.7"), new Settings());
- installer.installBatchExtensions(container, InstantiationStrategy.PER_PROJECT);
+ installer.installInspectionExtensions(container);
assertThat(container.getComponentByType(MavenService.class)).isNull();
assertThat(container.getComponentByType(BuildToolService.class)).isNotNull();
container.addSingleton(project);
ExtensionInstaller installer = new ExtensionInstaller(pluginRepository, new EnvironmentInformation("maven", "2.2.1"), new Settings());
- installer.installBatchExtensions(container, InstantiationStrategy.PER_PROJECT);
+ installer.installInspectionExtensions(container);
assertThat(container.getComponentByType(MavenService.class)).isNull();
}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2012 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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.bootstrap;
+
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.sonar.api.batch.bootstrap.ProjectDefinition;
+import org.sonar.api.database.model.Snapshot;
+import org.sonar.api.platform.ComponentContainer;
+import org.sonar.api.resources.Project;
+import org.sonar.api.resources.Resource;
+import org.sonar.batch.ProjectTree;
+import org.sonar.batch.index.ResourcePersister;
+import org.sonar.batch.tasks.InspectionModule;
+
+import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class InspectionModuleTest {
+ @Test
+ public void should_register_project_extensions() {
+ // components injected in the parent container
+ final Project project = new Project("foo");
+ project.setConfiguration(new PropertiesConfiguration());
+ final ProjectTree projectTree = mock(ProjectTree.class);
+ when(projectTree.getProjectDefinition(project)).thenReturn(ProjectDefinition.create());
+ final ResourcePersister resourcePersister = mock(ResourcePersister.class);
+ when(resourcePersister.getSnapshot(Matchers.<Resource> any())).thenReturn(new Snapshot());
+
+ final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class);
+ Module batchModule = new Module() {
+ @Override
+ protected void configure() {
+ container.addSingleton(extensionInstaller);
+ container.addSingleton(projectTree);
+ container.addSingleton(resourcePersister);
+ container.addSingleton(new BatchSettings());
+ }
+ };
+
+ batchModule.init();
+ InspectionModule projectModule = new InspectionModule(project);
+ batchModule.installChild(projectModule);
+
+ verify(extensionInstaller).installInspectionExtensions(any(ComponentContainer.class));
+ assertThat(projectModule.container.getComponentByType(ProjectSettings.class)).isNotNull();
+ }
+}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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.bootstrap;
-
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.bootstrap.ProjectDefinition;
-import org.sonar.api.database.model.Snapshot;
-import org.sonar.api.platform.ComponentContainer;
-import org.sonar.api.resources.Project;
-import org.sonar.api.resources.Resource;
-import org.sonar.batch.ProjectTree;
-import org.sonar.batch.index.ResourcePersister;
-
-import static org.fest.assertions.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class ProjectModuleTest {
- @Test
- public void should_register_project_extensions() {
- // components injected in the parent container
- final Project project = new Project("foo");
- project.setConfiguration(new PropertiesConfiguration());
- final ProjectTree projectTree = mock(ProjectTree.class);
- when(projectTree.getProjectDefinition(project)).thenReturn(ProjectDefinition.create());
- final ResourcePersister resourcePersister = mock(ResourcePersister.class);
- when(resourcePersister.getSnapshot(Matchers.<Resource>any())).thenReturn(new Snapshot());
-
- final ExtensionInstaller extensionInstaller = mock(ExtensionInstaller.class);
- Module batchModule = new Module() {
- @Override
- protected void configure() {
- container.addSingleton(extensionInstaller);
- container.addSingleton(projectTree);
- container.addSingleton(resourcePersister);
- container.addSingleton(new BatchSettings());
- }
- };
-
- batchModule.init();
- ProjectModule projectModule = new ProjectModule(project);
- batchModule.installChild(projectModule);
-
- verify(extensionInstaller).installBatchExtensions(any(ComponentContainer.class), eq(InstantiationStrategy.PER_PROJECT));
- assertThat(projectModule.container.getComponentByType(ProjectSettings.class)).isNotNull();
- }
-}
*/
package org.sonar.api.batch.bootstrap;
-import org.sonar.api.TaskExtension;
-import org.sonar.api.batch.RequiresProject;
+import org.sonar.api.BatchExtension;
+import org.sonar.api.batch.InstantiationStrategy;
/**
* This extension point allows to change project structure at runtime. It is executed once during task startup.
*
* @since 2.9
*/
-@RequiresProject
-public abstract class ProjectBuilder implements TaskExtension {
+@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
+public abstract class ProjectBuilder implements BatchExtension {
private ProjectReactor reactor;
projects / sonarqube.git / commitdiff