import org.sonar.api.batch.Event;
import org.sonar.api.batch.SonarIndex;
import org.sonar.api.database.model.ResourceModel;
+import org.sonar.api.database.model.RuleFailureModel;
import org.sonar.api.design.Dependency;
import org.sonar.api.measures.*;
import org.sonar.api.profiles.RulesProfile;
private Set<Dependency> dependencies = Sets.newHashSet();
private Map<Resource, Map<Resource, Dependency>> outgoingDependenciesByResource = Maps.newHashMap();
private Map<Resource, Map<Resource, Dependency>> incomingDependenciesByResource = Maps.newHashMap();
+ private Map<Resource, List<RuleFailureModel>> violationsByResource = Maps.newHashMap();
private ProjectTree projectTree;
public DefaultIndex(PersistenceManager persistence, DefaultResourceCreationLock lock, ProjectTree projectTree, MetricFinder metricFinder) {
lock.unlock();
}
-
/**
* Does nothing if the resource is already registered.
*/
return excluded;
}
-
public List<Resource> getChildren(Resource resource) {
List<Resource> children = Lists.newArrayList();
Bucket bucket = buckets.get(resource);
}
}
-
//
//
//
//
//
//
+
public Dependency addDependency(Dependency dependency) {
Dependency existingDep = getEdge(dependency.getFrom(), dependency.getTo());
if (existingDep != null) {
return result;
}
-
//
//
//
}
private void doAddViolation(Violation violation, Bucket bucket) {
+ Resource resource = violation.getResource();
+ if (!violationsByResource.containsKey(resource)) {
+ violationsByResource.put(resource, persistence.loadPreviousViolations(resource));
+ }
+ RuleFailureModel found = null;
+ List<RuleFailureModel> pastViolations = violationsByResource.get(resource);
+ for (RuleFailureModel pastViolation : pastViolations) {
+ // TODO Compare pastViolation to violation
+ if (pastViolation.getLine() == violation.getLineId() && StringUtils.equals(pastViolation.getMessage(), violation.getMessage())) {
+ found = pastViolation;
+ break;
+ }
+ }
bucket.addViolation(violation);
- persistence.saveViolation(currentProject, violation);
+ persistence.saveOrUpdateViolation(currentProject, violation, found);
}
//
//
//
//
+
public void addLink(ProjectLink link) {
persistence.saveLink(currentProject, link);
}
persistence.deleteLink(currentProject, key);
}
-
//
//
//
package org.sonar.batch.index;
import org.sonar.api.batch.Event;
+import org.sonar.api.database.model.RuleFailureModel;
import org.sonar.api.database.model.Snapshot;
import org.sonar.api.design.Dependency;
import org.sonar.api.measures.Measure;
dependencyPersister.saveDependency(project, dependency, parentDependency);
}
- public void saveViolation(Project project, Violation violation) {
- violationPersister.saveViolation(project, violation);
+ public List<RuleFailureModel> loadPreviousViolations(Resource resource) {
+ return violationPersister.getPreviousViolations(resource);
+ }
+
+ public void saveOrUpdateViolation(Project project, Violation violation, RuleFailureModel oldModel) {
+ violationPersister.saveOrUpdateViolation(project, violation, oldModel);
}
public void saveLink(Project project, ProjectLink link) {
import javax.persistence.NonUniqueResultException;
import javax.persistence.Query;
+
import java.util.Iterator;
import java.util.List;
import java.util.Map;
model = session.save(model);
resource.setId(model.getId()); // TODO to be removed
- Snapshot parentSnapshot = (Snapshot)ObjectUtils.defaultIfNull(getSnapshot(resource.getParent()), projectSnapshot);
+ Snapshot parentSnapshot = (Snapshot) ObjectUtils.defaultIfNull(getSnapshot(resource.getParent()), projectSnapshot);
Snapshot snapshot = new Snapshot(model, parentSnapshot);
snapshot = session.save(snapshot);
session.commit();
return snapshot;
}
+ public Snapshot getPreviousLastSnapshot(Snapshot snapshot) {
+ Query query = session.createQuery(
+ "SELECT s FROM " + Snapshot.class.getSimpleName() + " s " +
+ "WHERE s.last=true AND s.resourceId=:resourceId");
+ query.setParameter("resourceId", snapshot.getResourceId());
+ return session.getSingleResult(query, null);
+ }
+
public void clear() {
// we keep cache of projects
for (Iterator<Map.Entry<Resource, Snapshot>> it = snapshotsByResource.entrySet().iterator(); it.hasNext();) {
Map.Entry<Resource, Snapshot> entry = it.next();
- if (!ResourceUtils.isSet(entry.getKey())) {
+ if ( !ResourceUtils.isSet(entry.getKey())) {
it.remove();
}
}
}
-
private ResourceModel findOrCreateModel(Resource resource) {
ResourceModel model;
try {
if (StringUtils.isNotBlank(resource.getDescription())) {
model.setDescription(resource.getDescription());
}
- if (!ResourceUtils.isLibrary(resource)) {
+ if ( !ResourceUtils.isLibrary(resource)) {
model.setScope(resource.getScope());
model.setQualifier(resource.getQualifier());
}
package org.sonar.batch.index;
import org.sonar.api.batch.Event;
+import org.sonar.api.database.model.RuleFailureModel;
import org.sonar.api.database.model.Snapshot;
import org.sonar.api.design.Dependency;
import org.sonar.api.measures.Measure;
void saveDependency(Project project, Dependency dependency, Dependency parentDependency);
- void saveViolation(Project project, Violation violation);
+ List<RuleFailureModel> loadPreviousViolations(Resource resource);
+
+ void saveOrUpdateViolation(Project project, Violation violation, RuleFailureModel oldModel);
void saveLink(Project project, ProjectLink link);
Snapshot saveResource(Project project, Resource resource);
+ Snapshot getPreviousLastSnapshot(Snapshot snapshot);
+
void clear();
}
import org.sonar.api.database.model.RuleFailureModel;
import org.sonar.api.database.model.Snapshot;
import org.sonar.api.resources.Project;
+import org.sonar.api.resources.Resource;
import org.sonar.api.rules.Rule;
import org.sonar.api.rules.Violation;
import org.sonar.api.utils.SonarException;
+import java.util.Collections;
+import java.util.List;
import java.util.Map;
public final class ViolationPersister {
this.resourcePersister = resourcePersister;
}
- public void saveViolation(Project project, Violation violation) {
- Snapshot snapshot = resourcePersister.saveResource(project, violation.getResource());
- if (snapshot != null) {
- session.save(toModel(snapshot, violation));
+ public List<RuleFailureModel> getPreviousViolations(Resource resource) {
+ Snapshot snapshot = resourcePersister.getSnapshot(resource);
+ Snapshot previousLastSnapshot = resourcePersister.getPreviousLastSnapshot(snapshot);
+ if (previousLastSnapshot == null) {
+ return Collections.emptyList();
}
+ return session.getResults(RuleFailureModel.class, "snapshotId", previousLastSnapshot.getId());
}
- private RuleFailureModel toModel(Snapshot snapshot, Violation violation) {
- RuleFailureModel model = new RuleFailureModel();
- model.setRuleId(getRuleId(violation.getRule()));
- model.setPriority(violation.getPriority());
- model.setLine(violation.getLineId());
- model.setMessage(violation.getMessage());
- model.setCost(violation.getCost());
+ public void saveOrUpdateViolation(Project project, Violation violation, RuleFailureModel oldModel) {
+ Snapshot snapshot = resourcePersister.saveResource(project, violation.getResource());
+ if (snapshot == null) {
+ return; // TODO Godin why ? when?
+ }
+ RuleFailureModel model;
+ if (oldModel != null) {
+ // update
+ model = session.reattach(RuleFailureModel.class, oldModel.getId());
+ model = mergeModel(violation, oldModel);
+ } else {
+ // insert
+ model = createModel(violation);
+ }
model.setSnapshotId(snapshot.getId());
- return model;
+ session.save(model);
+ }
+
+ private RuleFailureModel createModel(Violation violation) {
+ return mergeModel(violation, new RuleFailureModel());
+ }
+
+ private RuleFailureModel mergeModel(Violation violation, RuleFailureModel merge) {
+ merge.setRuleId(getRuleId(violation.getRule()));
+ merge.setPriority(violation.getPriority());
+ merge.setLine(violation.getLineId());
+ merge.setMessage(violation.getMessage());
+ merge.setCost(violation.getCost());
+ return merge;
}
private Integer getRuleId(Rule rule) {
if (ruleId == null) {
ruleId = rule.getId();
if (ruleId == null) {
- Rule persistedRule = session.getSingleResult(Rule.class, "pluginName", rule.getRepositoryKey(), "key", rule.getKey(), "enabled", true);
+ Rule persistedRule = session.getSingleResult(Rule.class,
+ "pluginName", rule.getRepositoryKey(), "key", rule.getKey(), "enabled", true);
if (persistedRule == null) {
throw new SonarException("Rule not found: " + rule);
}
import org.sonar.api.database.DatabaseSession;
import org.sonar.api.database.model.Snapshot;
import org.sonar.batch.ServerMetadata;
+import org.sonar.batch.index.ResourcePersister;
import javax.persistence.Query;
private DatabaseSession session;
private ServerMetadata server;
private Snapshot snapshot; // TODO remove this component
+ private ResourcePersister resourcePersister;
- public UpdateStatusJob(ServerMetadata server, DatabaseSession session, Snapshot snapshot) {
+ public UpdateStatusJob(ServerMetadata server, DatabaseSession session, ResourcePersister resourcePersister, Snapshot snapshot) {
this.session = session;
this.server = server;
+ this.resourcePersister = resourcePersister;
this.snapshot = snapshot;
}
public void execute() {
- Snapshot previousLastSnapshot = getPreviousLastSnapshot(snapshot);
+ Snapshot previousLastSnapshot = resourcePersister.getPreviousLastSnapshot(snapshot);
updateFlags(snapshot, previousLastSnapshot);
}
- private Snapshot getPreviousLastSnapshot(Snapshot snapshot) {
- Query query = session.createQuery(
- "SELECT s FROM " + Snapshot.class.getSimpleName() + " s " +
- "WHERE s.last=true AND s.resourceId=:resourceId");
- query.setParameter("resourceId", snapshot.getResourceId());
- return session.getSingleResult(query, null);
- }
-
-
private void updateFlags(Snapshot rootSnapshot, Snapshot previousLastSnapshot) {
if (previousLastSnapshot != null && previousLastSnapshot.getCreatedAt().before(rootSnapshot.getCreatedAt())) {
setFlags(previousLastSnapshot, false, null);
import org.junit.Before;
import org.junit.Test;
+import org.sonar.api.database.model.RuleFailureModel;
import org.sonar.api.database.model.Snapshot;
import org.sonar.api.resources.JavaFile;
import org.sonar.api.resources.Project;
import org.sonar.api.rules.Violation;
import org.sonar.jpa.test.AbstractDbUnitTestCase;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.notNullValue;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
Snapshot snapshot = getSession().getSingleResult(Snapshot.class, "id", 1000);
ResourcePersister resourcePersister = mock(ResourcePersister.class);
when(resourcePersister.saveResource((Project) anyObject(), eq(javaFile))).thenReturn(snapshot);
+ when(resourcePersister.getPreviousLastSnapshot(snapshot)).thenReturn(snapshot);
+ when(resourcePersister.getSnapshot(javaFile)).thenReturn(snapshot);
violationPersister = new ViolationPersister(getSession(), resourcePersister);
}
+ @Test
+ public void shouldLoadViolations() {
+ List<RuleFailureModel> models = violationPersister.getPreviousViolations(javaFile);
+
+ assertThat(models, notNullValue());
+ assertThat(models.size(), greaterThan(0));
+ }
+
@Test
public void shouldSaveViolations() {
Violation violation1a = Violation.create(rule1, javaFile)
Violation violation2 = Violation.create(rule2, javaFile)
.setPriority(RulePriority.MINOR);
- violationPersister.saveViolation(new Project("project"), violation1a);
- violationPersister.saveViolation(new Project("project"), violation1b);
- violationPersister.saveViolation(new Project("project"), violation2);
+ violationPersister.saveOrUpdateViolation(new Project("project"), violation1a, null);
+ violationPersister.saveOrUpdateViolation(new Project("project"), violation1b, null);
+ violationPersister.saveOrUpdateViolation(new Project("project"), violation2, null);
+
+ checkTables("shouldInsertViolations", "rule_failures");
+ }
+
+ @Test
+ public void shouldUpdateViolation() {
+ Violation violation = Violation.create(rule1, javaFile)
+ .setPriority(RulePriority.CRITICAL).setLineId(20).setCost(55.6);
+ RuleFailureModel oldModel = violationPersister.getPreviousViolations(javaFile).iterator().next();
+
+ violationPersister.saveOrUpdateViolation(new Project("project"), violation, oldModel);
- checkTables("shouldSaveViolations", "rule_failures");
+ checkTables("shouldUpdateViolation", "rule_failures");
}
}
package org.sonar.batch.phases;
import org.junit.Test;
+import org.sonar.api.database.DatabaseSession;
import org.sonar.api.database.model.Snapshot;
import org.sonar.batch.ServerMetadata;
+import org.sonar.batch.index.DefaultResourcePersister;
import org.sonar.jpa.test.AbstractDbUnitTestCase;
import javax.persistence.Query;
private void assertAnalysis(int snapshotId, String fixture) {
setupData("sharedFixture", fixture);
-
- UpdateStatusJob sensor = new UpdateStatusJob(mock(ServerMetadata.class), getSession(), loadSnapshot(snapshotId));
+ DatabaseSession session = getSession();
+ UpdateStatusJob sensor = new UpdateStatusJob(mock(ServerMetadata.class), session, new DefaultResourcePersister(session), loadSnapshot(snapshotId));
sensor.execute();
getSession().stop();
checkTables(fixture, "snapshots");
}
-
private Snapshot loadSnapshot(int id) {
Query query = getSession().createQuery("SELECT s FROM Snapshot s WHERE s.id=:id");
query.setParameter("id", id);
scope="FIL" qualifier="CLA" created_at="2008-11-01 13:58:00.00" version="[null]" path=""
status="U" islast="false" depth="3" />
+ <RULE_FAILURES ID="1" SNAPSHOT_ID="1000" RULE_ID="30" FAILURE_LEVEL="3" MESSAGE="the message" LINE="20" COST="[null]"/>
</dataset>
\ No newline at end of file
--- /dev/null
+<dataset>
+ <rules_categories id="1" name="Efficiency" description="[null]"/>
+ <rules_categories id="6" name="Usability" description="[null]"/>
+
+ <rules id="30" name="Check Header" rules_category_id="6" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
+ plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" enabled="true"
+ cardinality="SINGLE" parent_id="[null]"/>
+
+ <rules id="31" name="Equals Avoid Null" rules_category_id="6" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"
+ plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" enabled="true"
+ cardinality="SINGLE" parent_id="[null]"/>
+
+ <projects id="200" scope="FIL" qualifier="CLA" kee="project:org.foo.Bar" root_id="[null]"
+ name="Bar" long_name="org.foo.Bar" description="[null]"
+ enabled="true" language="java" copy_resource_id="[null]" profile_id="[null]"/>
+
+ <snapshots id="1000" project_id="200" parent_snapshot_id="[null]" root_project_id="100" root_snapshot_id="[null]"
+ scope="FIL" qualifier="CLA" created_at="2008-11-01 13:58:00.00" version="[null]" path=""
+ status="U" islast="false" depth="3" />
+
+ <RULE_FAILURES ID="1" SNAPSHOT_ID="1000" RULE_ID="30" FAILURE_LEVEL="3" MESSAGE="the message" LINE="20" COST="[null]"/>
+ <RULE_FAILURES ID="2" SNAPSHOT_ID="1000" RULE_ID="30" FAILURE_LEVEL="3" MESSAGE="the message" LINE="20" COST="55.6"/>
+ <RULE_FAILURES ID="3" SNAPSHOT_ID="1000" RULE_ID="30" FAILURE_LEVEL="3" MESSAGE="[null]" LINE="50" COST="80"/>
+ <RULE_FAILURES ID="4" SNAPSHOT_ID="1000" RULE_ID="31" FAILURE_LEVEL="1" MESSAGE="[null]" LINE="[null]" COST="[null]"/>
+</dataset>
\ No newline at end of file
+++ /dev/null
-<dataset>
- <rules_categories id="1" name="Efficiency" description="[null]"/>
- <rules_categories id="6" name="Usability" description="[null]"/>
-
- <rules id="30" name="Check Header" rules_category_id="6" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
- plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" enabled="true"
- cardinality="SINGLE" parent_id="[null]"/>
-
- <rules id="31" name="Equals Avoid Null" rules_category_id="6" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"
- plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" enabled="true"
- cardinality="SINGLE" parent_id="[null]"/>
-
- <projects id="200" scope="FIL" qualifier="CLA" kee="project:org.foo.Bar" root_id="[null]"
- name="Bar" long_name="org.foo.Bar" description="[null]"
- enabled="true" language="java" copy_resource_id="[null]" profile_id="[null]"/>
-
- <snapshots id="1000" project_id="200" parent_snapshot_id="[null]" root_project_id="100" root_snapshot_id="[null]"
- scope="FIL" qualifier="CLA" created_at="2008-11-01 13:58:00.00" version="[null]" path=""
- status="U" islast="false" depth="3" />
-
- <RULE_FAILURES ID="1" SNAPSHOT_ID="1000" RULE_ID="30" FAILURE_LEVEL="3" MESSAGE="the message" LINE="20" COST="55.6"/>
- <RULE_FAILURES ID="2" SNAPSHOT_ID="1000" RULE_ID="30" FAILURE_LEVEL="3" MESSAGE="[null]" LINE="50" COST="80"/>
- <RULE_FAILURES ID="3" SNAPSHOT_ID="1000" RULE_ID="31" FAILURE_LEVEL="1" MESSAGE="[null]" LINE="[null]" COST="[null]"/>
-</dataset>
\ No newline at end of file
--- /dev/null
+<dataset>
+ <rules_categories id="1" name="Efficiency" description="[null]"/>
+ <rules_categories id="6" name="Usability" description="[null]"/>
+
+ <rules id="30" name="Check Header" rules_category_id="6" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
+ plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" enabled="true"
+ cardinality="SINGLE" parent_id="[null]"/>
+
+ <rules id="31" name="Equals Avoid Null" rules_category_id="6" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"
+ plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" enabled="true"
+ cardinality="SINGLE" parent_id="[null]"/>
+
+ <projects id="200" scope="FIL" qualifier="CLA" kee="project:org.foo.Bar" root_id="[null]"
+ name="Bar" long_name="org.foo.Bar" description="[null]"
+ enabled="true" language="java" copy_resource_id="[null]" profile_id="[null]"/>
+
+ <snapshots id="1000" project_id="200" parent_snapshot_id="[null]" root_project_id="100" root_snapshot_id="[null]"
+ scope="FIL" qualifier="CLA" created_at="2008-11-01 13:58:00.00" version="[null]" path=""
+ status="U" islast="false" depth="3" />
+
+ <RULE_FAILURES ID="1" SNAPSHOT_ID="1000" RULE_ID="30" FAILURE_LEVEL="3" MESSAGE="the message" LINE="20" COST="55.6"/>
+</dataset>
\ No newline at end of file
projects / sonarqube.git / commitdiff