--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * 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;
+
+import org.apache.commons.configuration.*;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.maven.project.MavenProject;
+import org.sonar.api.CoreProperties;
+import org.sonar.api.database.DatabaseSession;
+import org.sonar.api.database.model.ResourceModel;
+import org.sonar.api.database.model.Snapshot;
+import org.sonar.api.resources.DefaultProjectFileSystem;
+import org.sonar.api.resources.Java;
+import org.sonar.api.resources.Project;
+import org.sonar.api.utils.SonarException;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class MavenProjectBuilder {
+
+ private DatabaseSession databaseSession;
+
+ public MavenProjectBuilder(DatabaseSession databaseSession) {
+ this.databaseSession = databaseSession;
+ }
+
+ public Project create(MavenProject pom) {
+ Configuration configuration = getStartupConfiguration(pom);
+ return new Project(loadProjectKey(pom), loadProjectBranch(configuration), pom.getName())
+ .setPom(pom)
+ .setDescription(pom.getDescription())
+ .setPackaging(pom.getPackaging());
+ }
+
+ Configuration getStartupConfiguration(MavenProject pom) {
+ CompositeConfiguration configuration = new CompositeConfiguration();
+ configuration.addConfiguration(new SystemConfiguration());
+ configuration.addConfiguration(new EnvironmentConfiguration());
+ configuration.addConfiguration(new MapConfiguration(pom.getModel().getProperties()));
+ return configuration;
+ }
+
+ String loadProjectKey(MavenProject pom) {
+ return new StringBuilder().append(pom.getGroupId()).append(":").append(pom.getArtifactId()).toString();
+ }
+
+ String loadProjectBranch(Configuration configuration) {
+ return configuration.getString(CoreProperties.PROJECT_BRANCH_PROPERTY, configuration.getString("branch" /* deprecated property */));
+ }
+
+
+ public void configure(Project project) {
+ ProjectConfiguration projectConfiguration = new ProjectConfiguration(databaseSession, project);
+ configure(project, projectConfiguration);
+ }
+
+
+ void configure(Project project, Configuration projectConfiguration) {
+ Date analysisDate = loadAnalysisDate(projectConfiguration);
+ project.setConfiguration(projectConfiguration)
+ .setExclusionPatterns(loadExclusionPatterns(projectConfiguration))
+ .setAnalysisDate(analysisDate)
+ .setLatestAnalysis(isLatestAnalysis(project.getKey(), analysisDate))
+ .setAnalysisVersion(loadAnalysisVersion(projectConfiguration, project.getPom()))
+ .setAnalysisType(loadAnalysisType(projectConfiguration))
+ .setLanguageKey(loadLanguageKey(projectConfiguration))
+ .setFileSystem(new DefaultProjectFileSystem(project));
+ }
+
+ static String[] loadExclusionPatterns(Configuration configuration) {
+ String[] exclusionPatterns = configuration.getStringArray(CoreProperties.PROJECT_EXCLUSIONS_PROPERTY);
+ if (exclusionPatterns == null) {
+ exclusionPatterns = new String[0];
+ }
+ return exclusionPatterns;
+ }
+
+ boolean isLatestAnalysis(String projectKey, Date analysisDate) {
+ ResourceModel persistedProject = databaseSession.getSingleResult(ResourceModel.class, "key", projectKey, "enabled", true);
+ if (persistedProject != null) {
+ Snapshot lastSnapshot = databaseSession.getSingleResult(Snapshot.class, "resourceId", persistedProject.getId(), "last", true);
+ return lastSnapshot == null || lastSnapshot.getCreatedAt().before(analysisDate);
+ }
+ return true;
+ }
+
+
+ Date loadAnalysisDate(Configuration configuration) {
+ String formattedDate = configuration.getString(CoreProperties.PROJECT_DATE_PROPERTY);
+ if (formattedDate == null) {
+ return new Date();
+ }
+
+ DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ // see SONAR-908 make sure that a time is defined for the date.
+ Date date = DateUtils.setHours(format.parse(formattedDate), 0);
+ return DateUtils.setMinutes(date, 1);
+
+ } catch (ParseException e) {
+ throw new SonarException("The property " + CoreProperties.PROJECT_DATE_PROPERTY + " does not respect the format yyyy-MM-dd (for example 2008-05-23) : " + formattedDate, e);
+ }
+ }
+
+ Project.AnalysisType loadAnalysisType(Configuration configuration) {
+ String value = configuration.getString(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY);
+ if (value == null) {
+ return (configuration.getBoolean("sonar.light", false) ? Project.AnalysisType.STATIC : Project.AnalysisType.DYNAMIC);
+ }
+ if ("true".equals(value)) {
+ return Project.AnalysisType.DYNAMIC;
+ }
+ if ("reuseReports".equals(value)) {
+ return Project.AnalysisType.REUSE_REPORTS;
+ }
+ return Project.AnalysisType.STATIC;
+ }
+
+ String loadAnalysisVersion(Configuration configuration, MavenProject pom) {
+ String version = configuration.getString(CoreProperties.PROJECT_VERSION_PROPERTY);
+ if (version == null && pom != null) {
+ version = pom.getVersion();
+ }
+ return version;
+ }
+
+ String loadLanguageKey(Configuration configuration) {
+ return configuration.getString(CoreProperties.PROJECT_LANGUAGE_PROPERTY, Java.KEY);
+ }
+}
import org.picocontainer.Characteristics;
import org.picocontainer.MutablePicoContainer;
import org.sonar.api.batch.BatchExtensionDictionnary;
+import org.sonar.api.batch.FileFilter;
import org.sonar.api.batch.ProjectClasspath;
-import org.sonar.api.batch.ResourceCreationLock;
import org.sonar.api.batch.SensorContext;
import org.sonar.api.database.DatabaseSession;
import org.sonar.api.measures.CoreMetrics;
import org.sonar.api.measures.Metric;
import org.sonar.api.measures.Metrics;
+import org.sonar.api.resources.DefaultProjectFileSystem;
import org.sonar.api.resources.Languages;
import org.sonar.api.resources.Project;
import org.sonar.api.rules.DefaultRulesManager;
import org.sonar.core.rule.DefaultRuleFinder;
import org.sonar.jpa.dao.*;
+import java.util.List;
+
public class ProjectBatch {
private MutablePicoContainer globalContainer;
batchContainer.start();
// post-initializations
+ prepareProject(project, index);
+ }
+
+ private void prepareProject(Project project, DefaultSonarIndex index) {
project.setLanguage(getComponent(Languages.class).get(project.getLanguageKey()));
index.selectProject(project, getComponent(ResourceFilters.class), getComponent(ViolationFilters.class), getComponent(MeasuresDao.class), getComponent(ViolationsDao.class));
+
+ List<FileFilter> fileFilters = batchContainer.getComponents(FileFilter.class);
+ ((DefaultProjectFileSystem)project.getFileSystem()).addFileFilters(fileFilters);
}
private void loadCoreComponents(MutablePicoContainer container) {
try {
globalContainer.removeChildContainer(batchContainer);
batchContainer.stop();
- batchContainer=null;
+ batchContainer = null;
} catch (Exception e) {
// do not log
}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
- * 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;
-
-import org.apache.commons.configuration.*;
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.maven.project.MavenProject;
-import org.sonar.api.CoreProperties;
-import org.sonar.api.database.DatabaseSession;
-import org.sonar.api.database.model.ResourceModel;
-import org.sonar.api.database.model.Snapshot;
-import org.sonar.api.resources.DefaultProjectFileSystem;
-import org.sonar.api.resources.Java;
-import org.sonar.api.resources.Project;
-import org.sonar.api.utils.SonarException;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class ProjectBuilder {
-
- private DatabaseSession databaseSession;
-
- public ProjectBuilder(DatabaseSession databaseSession) {
- this.databaseSession = databaseSession;
- }
-
- public Project create(MavenProject pom) {
- Configuration configuration = getStartupConfiguration(pom);
- return new Project(loadProjectKey(pom), loadProjectBranch(configuration), pom.getName())
- .setPom(pom)
- .setDescription(pom.getDescription())
- .setPackaging(pom.getPackaging());
- }
-
- Configuration getStartupConfiguration(MavenProject pom) {
- CompositeConfiguration configuration = new CompositeConfiguration();
- configuration.addConfiguration(new SystemConfiguration());
- configuration.addConfiguration(new EnvironmentConfiguration());
- configuration.addConfiguration(new MapConfiguration(pom.getModel().getProperties()));
- return configuration;
- }
-
- String loadProjectKey(MavenProject pom) {
- return new StringBuilder().append(pom.getGroupId()).append(":").append(pom.getArtifactId()).toString();
- }
-
- String loadProjectBranch(Configuration configuration) {
- return configuration.getString(CoreProperties.PROJECT_BRANCH_PROPERTY, configuration.getString("branch" /* deprecated property */));
- }
-
-
- public void configure(Project project) {
- ProjectConfiguration projectConfiguration = new ProjectConfiguration(databaseSession, project);
- configure(project, projectConfiguration);
- }
-
-
- void configure(Project project, Configuration projectConfiguration) {
- Date analysisDate = loadAnalysisDate(projectConfiguration);
- project.setConfiguration(projectConfiguration)
- .setExclusionPatterns(loadExclusionPatterns(projectConfiguration))
- .setAnalysisDate(analysisDate)
- .setLatestAnalysis(isLatestAnalysis(project.getKey(), analysisDate))
- .setAnalysisVersion(loadAnalysisVersion(projectConfiguration, project.getPom()))
- .setAnalysisType(loadAnalysisType(projectConfiguration))
- .setLanguageKey(loadLanguageKey(projectConfiguration))
- .setFileSystem(new DefaultProjectFileSystem(project));
- }
-
- static String[] loadExclusionPatterns(Configuration configuration) {
- String[] exclusionPatterns = configuration.getStringArray(CoreProperties.PROJECT_EXCLUSIONS_PROPERTY);
- if (exclusionPatterns == null) {
- exclusionPatterns = new String[0];
- }
- return exclusionPatterns;
- }
-
- boolean isLatestAnalysis(String projectKey, Date analysisDate) {
- ResourceModel persistedProject = databaseSession.getSingleResult(ResourceModel.class, "key", projectKey, "enabled", true);
- if (persistedProject != null) {
- Snapshot lastSnapshot = databaseSession.getSingleResult(Snapshot.class, "resourceId", persistedProject.getId(), "last", true);
- return lastSnapshot == null || lastSnapshot.getCreatedAt().before(analysisDate);
- }
- return true;
- }
-
-
- Date loadAnalysisDate(Configuration configuration) {
- String formattedDate = configuration.getString(CoreProperties.PROJECT_DATE_PROPERTY);
- if (formattedDate == null) {
- return new Date();
- }
-
- DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- try {
- // see SONAR-908 make sure that a time is defined for the date.
- Date date = DateUtils.setHours(format.parse(formattedDate), 0);
- return DateUtils.setMinutes(date, 1);
-
- } catch (ParseException e) {
- throw new SonarException("The property " + CoreProperties.PROJECT_DATE_PROPERTY + " does not respect the format yyyy-MM-dd (for example 2008-05-23) : " + formattedDate, e);
- }
- }
-
- Project.AnalysisType loadAnalysisType(Configuration configuration) {
- String value = configuration.getString(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY);
- if (value == null) {
- return (configuration.getBoolean("sonar.light", false) ? Project.AnalysisType.STATIC : Project.AnalysisType.DYNAMIC);
- }
- if ("true".equals(value)) {
- return Project.AnalysisType.DYNAMIC;
- }
- if ("reuseReports".equals(value)) {
- return Project.AnalysisType.REUSE_REPORTS;
- }
- return Project.AnalysisType.STATIC;
- }
-
- String loadAnalysisVersion(Configuration configuration, MavenProject pom) {
- String version = configuration.getString(CoreProperties.PROJECT_VERSION_PROPERTY);
- if (version == null && pom != null) {
- version = pom.getVersion();
- }
- return version;
- }
-
- String loadLanguageKey(Configuration configuration) {
- return configuration.getString(CoreProperties.PROJECT_LANGUAGE_PROPERTY, Java.KEY);
- }
-}
private List<Project> projects;
private List<MavenProject> poms;
- private ProjectBuilder projectBuilder;
+ private MavenProjectBuilder projectBuilder;
public ProjectTree(MavenSession mavenSession, DatabaseSession databaseSession) {
this.poms = mavenSession.getSortedProjects();
- this.projectBuilder = new ProjectBuilder(databaseSession);
+ this.projectBuilder = new MavenProjectBuilder(databaseSession);
}
/**
* for unit tests
*/
- protected ProjectTree(ProjectBuilder projectBuilder, List<MavenProject> poms) {
+ protected ProjectTree(MavenProjectBuilder projectBuilder, List<MavenProject> poms) {
this.projectBuilder = projectBuilder;
this.poms = poms;
}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * 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;
+
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.junit.Before;
+import org.junit.Test;
+import org.sonar.api.CoreProperties;
+import org.sonar.jpa.test.AbstractDbUnitTestCase;
+import org.sonar.api.resources.Java;
+import org.sonar.api.resources.Project;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class MavenProjectBuilderTest extends AbstractDbUnitTestCase {
+
+ private MavenProjectBuilder builder = null;
+
+ @Before
+ public void before() {
+ builder = new MavenProjectBuilder(getSession());
+ }
+
+ @Test
+ public void noExclusionPatterns() {
+ Project project = new Project("key");
+ builder.configure(project, new PropertiesConfiguration());
+
+ assertThat(project.getExclusionPatterns().length, is(0));
+ }
+
+ @Test
+ public void manyExclusionPatterns() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.PROJECT_EXCLUSIONS_PROPERTY, "**/*,foo,*/bar");
+
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+
+ assertThat(project.getExclusionPatterns().length, is(3));
+ assertThat(project.getExclusionPatterns()[0], is("**/*"));
+ assertThat(project.getExclusionPatterns()[1], is("foo"));
+ assertThat(project.getExclusionPatterns()[2], is("*/bar"));
+ }
+
+ @Test
+ public void getLanguageFromConfiguration() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.PROJECT_LANGUAGE_PROPERTY, "foo");
+
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+
+ assertThat(project.getLanguageKey(), is("foo"));
+ }
+
+ @Test
+ public void defaultLanguageIsJava() {
+ Project project = new Project("key");
+ builder.configure(project, new PropertiesConfiguration());
+
+ assertThat(project.getLanguageKey(), is(Java.KEY));
+ }
+
+ @Test
+ public void analysisIsTodayByDefault() {
+ Project project = new Project("key");
+ builder.configure(project, new PropertiesConfiguration());
+ Date today = new Date();
+ assertTrue(today.getTime() - project.getAnalysisDate().getTime() < 1000);
+ }
+
+ @Test
+ public void analysisDateCouldBeExplicitlySet() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2005-01-30");
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+
+ assertEquals("30012005", new SimpleDateFormat("ddMMyyyy").format(project.getAnalysisDate()));
+ }
+
+ @Test(expected = RuntimeException.class)
+ public void failIfAnalyisDateIsNotValid() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2005/30/01");
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+
+ project.getAnalysisDate();
+ }
+
+ @Test
+ public void sonarLightIsDeprecated() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty("sonar.light", "true");
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+
+ assertThat(project.getAnalysisType(), is(Project.AnalysisType.STATIC));
+ }
+
+ @Test
+ public void defaultAnalysisTypeIsDynamic() {
+ Project project = new Project("key");
+ builder.configure(project, new PropertiesConfiguration());
+ assertThat(project.getAnalysisType(), is(Project.AnalysisType.DYNAMIC));
+ }
+
+ @Test
+ public void explicitDynamicAnalysis() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY, "true");
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+ assertThat(project.getAnalysisType(), is(Project.AnalysisType.DYNAMIC));
+ }
+
+ @Test
+ public void explicitStaticAnalysis() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY, "false");
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+ assertThat(project.getAnalysisType(), is(Project.AnalysisType.STATIC));
+ }
+
+ @Test
+ public void explicitDynamicAnalysisReusingReports() {
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY, "reuseReports");
+ Project project = new Project("key");
+ builder.configure(project, configuration);
+ assertThat(project.getAnalysisType(), is(Project.AnalysisType.REUSE_REPORTS));
+ }
+
+ @Test
+ public void isDynamicAnalysis() {
+ assertThat(Project.AnalysisType.DYNAMIC.isDynamic(false), is(true));
+ assertThat(Project.AnalysisType.DYNAMIC.isDynamic(true), is(true));
+
+ assertThat(Project.AnalysisType.STATIC.isDynamic(false), is(false));
+ assertThat(Project.AnalysisType.STATIC.isDynamic(true), is(false));
+
+ assertThat(Project.AnalysisType.REUSE_REPORTS.isDynamic(false), is(false));
+ assertThat(Project.AnalysisType.REUSE_REPORTS.isDynamic(true), is(true));
+ }
+
+ @Test
+ public void isLatestAnalysis() {
+ setupData("isLatestAnalysis");
+
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2010-12-25");
+
+ Project project = new Project("my:key");
+ builder.configure(project, configuration);
+
+ assertThat(project.isLatestAnalysis(), is(true));
+ }
+
+ @Test
+ public void isLatestAnalysisIfNeverAnalysed() {
+ setupData("isLatestAnalysisIfNeverAnalysed");
+
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2010-12-25");
+
+ Project project = new Project("my:key");
+ builder.configure(project, configuration);
+
+ assertThat(project.isLatestAnalysis(), is(true));
+ }
+
+ @Test
+ public void isNotLatestAnalysis() {
+ setupData("isNotLatestAnalysis");
+
+ PropertiesConfiguration configuration = new PropertiesConfiguration();
+ configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2005-12-25");
+
+ Project project = new Project("my:key");
+ builder.configure(project, configuration);
+
+ assertThat(project.isLatestAnalysis(), is(false));
+ }
+}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
- * 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;
-
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.junit.Before;
-import org.junit.Test;
-import org.sonar.api.CoreProperties;
-import org.sonar.jpa.test.AbstractDbUnitTestCase;
-import org.sonar.api.resources.Java;
-import org.sonar.api.resources.Project;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class ProjectBuilderTest extends AbstractDbUnitTestCase {
-
- private ProjectBuilder builder = null;
-
- @Before
- public void before() {
- builder = new ProjectBuilder(getSession());
- }
-
- @Test
- public void noExclusionPatterns() {
- Project project = new Project("key");
- builder.configure(project, new PropertiesConfiguration());
-
- assertThat(project.getExclusionPatterns().length, is(0));
- }
-
- @Test
- public void manyExclusionPatterns() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.PROJECT_EXCLUSIONS_PROPERTY, "**/*,foo,*/bar");
-
- Project project = new Project("key");
- builder.configure(project, configuration);
-
- assertThat(project.getExclusionPatterns().length, is(3));
- assertThat(project.getExclusionPatterns()[0], is("**/*"));
- assertThat(project.getExclusionPatterns()[1], is("foo"));
- assertThat(project.getExclusionPatterns()[2], is("*/bar"));
- }
-
- @Test
- public void getLanguageFromConfiguration() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.PROJECT_LANGUAGE_PROPERTY, "foo");
-
- Project project = new Project("key");
- builder.configure(project, configuration);
-
- assertThat(project.getLanguageKey(), is("foo"));
- }
-
- @Test
- public void defaultLanguageIsJava() {
- Project project = new Project("key");
- builder.configure(project, new PropertiesConfiguration());
-
- assertThat(project.getLanguageKey(), is(Java.KEY));
- }
-
- @Test
- public void analysisIsTodayByDefault() {
- Project project = new Project("key");
- builder.configure(project, new PropertiesConfiguration());
- Date today = new Date();
- assertTrue(today.getTime() - project.getAnalysisDate().getTime() < 1000);
- }
-
- @Test
- public void analysisDateCouldBeExplicitlySet() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2005-01-30");
- Project project = new Project("key");
- builder.configure(project, configuration);
-
- assertEquals("30012005", new SimpleDateFormat("ddMMyyyy").format(project.getAnalysisDate()));
- }
-
- @Test(expected = RuntimeException.class)
- public void failIfAnalyisDateIsNotValid() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2005/30/01");
- Project project = new Project("key");
- builder.configure(project, configuration);
-
- project.getAnalysisDate();
- }
-
- @Test
- public void sonarLightIsDeprecated() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty("sonar.light", "true");
- Project project = new Project("key");
- builder.configure(project, configuration);
-
- assertThat(project.getAnalysisType(), is(Project.AnalysisType.STATIC));
- }
-
- @Test
- public void defaultAnalysisTypeIsDynamic() {
- Project project = new Project("key");
- builder.configure(project, new PropertiesConfiguration());
- assertThat(project.getAnalysisType(), is(Project.AnalysisType.DYNAMIC));
- }
-
- @Test
- public void explicitDynamicAnalysis() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY, "true");
- Project project = new Project("key");
- builder.configure(project, configuration);
- assertThat(project.getAnalysisType(), is(Project.AnalysisType.DYNAMIC));
- }
-
- @Test
- public void explicitStaticAnalysis() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY, "false");
- Project project = new Project("key");
- builder.configure(project, configuration);
- assertThat(project.getAnalysisType(), is(Project.AnalysisType.STATIC));
- }
-
- @Test
- public void explicitDynamicAnalysisReusingReports() {
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.DYNAMIC_ANALYSIS_PROPERTY, "reuseReports");
- Project project = new Project("key");
- builder.configure(project, configuration);
- assertThat(project.getAnalysisType(), is(Project.AnalysisType.REUSE_REPORTS));
- }
-
- @Test
- public void isDynamicAnalysis() {
- assertThat(Project.AnalysisType.DYNAMIC.isDynamic(false), is(true));
- assertThat(Project.AnalysisType.DYNAMIC.isDynamic(true), is(true));
-
- assertThat(Project.AnalysisType.STATIC.isDynamic(false), is(false));
- assertThat(Project.AnalysisType.STATIC.isDynamic(true), is(false));
-
- assertThat(Project.AnalysisType.REUSE_REPORTS.isDynamic(false), is(false));
- assertThat(Project.AnalysisType.REUSE_REPORTS.isDynamic(true), is(true));
- }
-
- @Test
- public void isLatestAnalysis() {
- setupData("isLatestAnalysis");
-
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2010-12-25");
-
- Project project = new Project("my:key");
- builder.configure(project, configuration);
-
- assertThat(project.isLatestAnalysis(), is(true));
- }
-
- @Test
- public void isLatestAnalysisIfNeverAnalysed() {
- setupData("isLatestAnalysisIfNeverAnalysed");
-
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2010-12-25");
-
- Project project = new Project("my:key");
- builder.configure(project, configuration);
-
- assertThat(project.isLatestAnalysis(), is(true));
- }
-
- @Test
- public void isNotLatestAnalysis() {
- setupData("isNotLatestAnalysis");
-
- PropertiesConfiguration configuration = new PropertiesConfiguration();
- configuration.setProperty(CoreProperties.PROJECT_DATE_PROPERTY, "2005-12-25");
-
- Project project = new Project("my:key");
- builder.configure(project, configuration);
-
- assertThat(project.isLatestAnalysis(), is(false));
- }
-}
return pom;
}
- private ProjectBuilder newProjectBuilder() {
- return new ProjectBuilder(getSession());
+ private MavenProjectBuilder newProjectBuilder() {
+ return new MavenProjectBuilder(getSession());
}
}
--- /dev/null
+<dataset>
+
+ <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="my:key"
+ name="My project" root_id="[null]"
+ description="[null]"
+ enabled="true" language="java" copy_resource_id="[null]"/>
+
+ <snapshots depth="[null]" id="30" scope="PRJ" qualifier="TRK" created_at="2008-11-01 13:58:00.00" version="[null]"
+ project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
+ path="[null]"/>
+
+ <snapshots depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
+ project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+ path="[null]"/>
+</dataset>
\ No newline at end of file
--- /dev/null
+<dataset>
+
+ <!-- other project -->
+ <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="other:key"
+ name="My project" root_id="[null]"
+ description="[null]"
+ enabled="true" language="java" copy_resource_id="[null]"/>
+
+ <snapshots depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
+ project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+ path="[null]"/>
+</dataset>
\ No newline at end of file
--- /dev/null
+<dataset>
+
+ <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="my:key"
+ name="My project" root_id="[null]"
+ description="[null]"
+ enabled="true" language="java" copy_resource_id="[null]"/>
+
+ <snapshots depth="[null]" id="30" scope="PRJ" qualifier="TRK" created_at="2010-11-01 13:58:00.00" version="[null]"
+ project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
+ path="[null]"/>
+
+ <snapshots depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="2010-12-02 13:58:00.00" version="[null]"
+ project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+ path="[null]"/>
+</dataset>
\ No newline at end of file
+++ /dev/null
-<dataset>
-
- <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="my:key"
- name="My project" root_id="[null]"
- description="[null]"
- enabled="true" language="java" copy_resource_id="[null]"/>
-
- <snapshots depth="[null]" id="30" scope="PRJ" qualifier="TRK" created_at="2008-11-01 13:58:00.00" version="[null]"
- project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
- path="[null]"/>
-
- <snapshots depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
- project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
- path="[null]"/>
-</dataset>
\ No newline at end of file
+++ /dev/null
-<dataset>
-
- <!-- other project -->
- <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="other:key"
- name="My project" root_id="[null]"
- description="[null]"
- enabled="true" language="java" copy_resource_id="[null]"/>
-
- <snapshots depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="2008-12-02 13:58:00.00" version="[null]"
- project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
- path="[null]"/>
-</dataset>
\ No newline at end of file
+++ /dev/null
-<dataset>
-
- <projects long_name="[null]" id="5" scope="PRJ" qualifier="TRK" kee="my:key"
- name="My project" root_id="[null]"
- description="[null]"
- enabled="true" language="java" copy_resource_id="[null]"/>
-
- <snapshots depth="[null]" id="30" scope="PRJ" qualifier="TRK" created_at="2010-11-01 13:58:00.00" version="[null]"
- project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="false"
- path="[null]"/>
-
- <snapshots depth="[null]" id="50" scope="PRJ" qualifier="TRK" created_at="2010-12-02 13:58:00.00" version="[null]"
- project_id="5" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
- path="[null]"/>
-</dataset>
\ No newline at end of file
*/
package org.sonar.api.batch;
+import com.google.common.collect.Lists;
import org.sonar.api.measures.FormulaData;
import org.sonar.api.measures.Measure;
import org.sonar.api.measures.MeasuresFilter;
import org.sonar.api.measures.Metric;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
}
public Collection<FormulaData> getChildren() {
- List<FormulaData> result = new ArrayList<FormulaData>();
+ List<FormulaData> result = Lists.newArrayList();
for (DecoratorContext childContext : decoratorContext.getChildren()) {
result.add(new DefaultFormulaData(childContext));
}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * 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.api.batch;
+
+import org.sonar.api.BatchExtension;
+
+public abstract class FileFilter implements java.io.FileFilter, BatchExtension {
+
+}
*/
package org.sonar.api.batch;
+import com.google.common.collect.Lists;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.project.MavenProject;
import org.sonar.api.BatchComponent;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.ArrayList;
import java.util.List;
/**
protected URLClassLoader createClassLoader() {
try {
- List<URL> urls = new ArrayList<URL>();
+ List<URL> urls = Lists.newArrayList();
for (File file : getElements()) {
urls.add(file.toURI().toURL());
}
protected List<File> createElements() {
try {
- List<File> files = new ArrayList<File>();
+ List<File> files = Lists.newArrayList();
if (pom.getCompileClasspathElements() != null) {
for (String classPathString : (List<String>) pom.getCompileClasspathElements()) {
files.add(new File(classPathString));
*/
package org.sonar.api.resources;
+import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.filefilter.*;
import org.apache.commons.lang.CharEncoding;
import org.apache.commons.lang.StringUtils;
+import org.sonar.api.batch.FileFilter;
import org.sonar.api.batch.maven.MavenUtils;
import org.sonar.api.utils.SonarException;
import org.sonar.api.utils.WildcardPattern;
public class DefaultProjectFileSystem implements ProjectFileSystem {
private Project project;
+ private List<IOFileFilter> filters = Lists.newArrayList();
/**
* Creates a DefaultProjectFileSystem based on a project
}
+ public DefaultProjectFileSystem addFileFilters(List<FileFilter> l) {
+ for (FileFilter fileFilter : l) {
+ addFileFilter(fileFilter);
+ }
+ return this;
+ }
+
+ public DefaultProjectFileSystem addFileFilter(FileFilter fileFilter) {
+ filters.add(new DelegateFileFilter(fileFilter));
+ return this;
+ }
+
/**
* Basedir is the project root directory.
*/
if (dir.exists()) {
IOFileFilter exclusionFilter = new ExclusionFilter(dir, exclusionPatterns);
IOFileFilter visibleFileFilter = HiddenFileFilter.VISIBLE;
- AndFileFilter filters = new AndFileFilter(new AndFileFilter(exclusionFilter, suffixFilter), visibleFileFilter);
- result.addAll(FileUtils.listFiles(dir, filters, HiddenFileFilter.VISIBLE));
+ List dirFilters = Lists.newArrayList(visibleFileFilter, suffixFilter, exclusionFilter);
+ dirFilters.addAll(this.filters);
+ result.addAll(FileUtils.listFiles(dir, new AndFileFilter(dirFilters), HiddenFileFilter.VISIBLE));
}
}
return result;
private IOFileFilter getFileSuffixFilter(Language... langs) {
IOFileFilter suffixFilter = FileFilterUtils.trueFileFilter();
- if (langs != null && langs.length>0) {
+ if (langs != null && langs.length > 0) {
List<String> suffixes = new ArrayList<String>();
for (Language lang : langs) {
if (lang.getFileSuffixes() != null) {
}
return false;
}
-
}
*/
package org.sonar.api.resources;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.SystemUtils;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Before;
import org.junit.Test;
+import org.sonar.api.batch.FileFilter;
import org.sonar.api.test.MavenTestUtils;
import java.io.File;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
public class DefaultProjectFileSystemTest {
}
}
+
+ @Test
+ public void shouldAddExtendedFilters() {
+ DefaultProjectFileSystem fs = new DefaultProjectFileSystem(project);
+ assertThat(fs.getSourceFiles().size(), is(2));
+ assertThat(fs.getSourceFiles(), hasItem(named("Bar.java")));
+
+ fs.addFileFilter(new FileFilter() {
+ public boolean accept(File file) {
+ return !StringUtils.equals(file.getName(), "Bar.java");
+ }
+ });
+ assertThat(fs.getSourceFiles().size(), is(1));
+ assertThat(fs.getSourceFiles(), not(hasItem(named("Bar.java"))));
+ }
+
private static Matcher<java.io.File> named(final String name) {
return new TypeSafeMatcher<java.io.File>() {
java.io.File fileTested;
projects / sonarqube.git / commitdiff