From 50a43f7b9dab293b61fabe742252dca659f2e4ca Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Wed, 27 Apr 2011 14:25:18 +0200 Subject: [PATCH] SONAR-2381 Improve the violations WS decorated with reviews --- .../src/main/webapp/WEB-INF/app/models/rule_failure.rb | 8 ++++---- .../java/org/sonar/wsclient/services/Violation.java | 10 +++++----- .../wsclient/unmarshallers/ViolationUnmarshaller.java | 2 +- .../unmarshallers/ViolationUnmarshallerTest.java | 6 +++--- .../src/test/resources/violations/false-positive.json | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/rule_failure.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/rule_failure.rb index c39747fadaf..01c7acb2f56 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/rule_failure.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/rule_failure.rb @@ -46,7 +46,7 @@ class RuleFailure < ActiveRecord::Base json['message'] = message json['line'] = line if line && line>=1 json['priority'] = Sonar::RulePriority.to_s(failure_level).upcase - json['falsePositive']=true if false_positive? + json['switchedOff']=true if switched_off? if created_at json['createdAt'] = format_datetime(created_at) end @@ -61,7 +61,7 @@ class RuleFailure < ActiveRecord::Base :qualifier => snapshot.project.qualifier, :language => snapshot.project.language } - json['review']=review.id if review + json['review']=review.id.to_i if review json end @@ -70,7 +70,7 @@ class RuleFailure < ActiveRecord::Base xml.message(message) xml.line(line) if line && line>=1 xml.priority(Sonar::RulePriority.to_s(failure_level)) - xml.falsePositive(true) if false_positive? + xml.switchedOff(true) if switched_off? if created_at xml.createdAt(format_datetime(created_at)) end @@ -85,7 +85,7 @@ class RuleFailure < ActiveRecord::Base xml.qualifier(snapshot.project.qualifier) xml.language(snapshot.project.language) end - xml.review(review.id) if review + xml.review(review.id.to_i) if review end end diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Violation.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Violation.java index 4e170124c6b..d077ac97495 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Violation.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/Violation.java @@ -33,7 +33,7 @@ public class Violation extends Model { private String resourceScope = null; private String resourceQualifier = null; private Date createdAt = null; - private boolean falsePositive; + private boolean switchedOff; private Long reviewId = null; public String getMessage() { @@ -180,16 +180,16 @@ public class Violation extends Model { /** * @since 2.8 */ - public Violation setFalsePositive(Boolean b) { - this.falsePositive = (b != null && b); + public Violation setSwitchedOff(Boolean b) { + this.switchedOff = (b != null && b); return this; } /** * @since 2.8 */ - public boolean isFalsePositive() { - return falsePositive; + public boolean isSwitchedOff() { + return switchedOff; } public Long getReviewId() { diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshaller.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshaller.java index 45f692b582c..a73d4b3c4fa 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshaller.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshaller.java @@ -33,7 +33,7 @@ public class ViolationUnmarshaller extends AbstractUnmarshaller { violation.setLine(utils.getInteger(json, "line")); violation.setSeverity(utils.getString(json, "priority")); violation.setCreatedAt(utils.getDateTime(json, "createdAt")); - violation.setFalsePositive(utils.getBoolean(json, "falsePositive")); + violation.setSwitchedOff(utils.getBoolean(json, "switchedOff")); violation.setReviewId(utils.getLong(json, "review")); Object rule = utils.getField(json, "rule"); diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshallerTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshallerTest.java index 4652c2cd9d9..16e07efff38 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshallerTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/unmarshallers/ViolationUnmarshallerTest.java @@ -53,7 +53,7 @@ public class ViolationUnmarshallerTest extends UnmarshallerTestCase { assertThat(violation.getResourceName(), is("TraceableResourceLimitingPool")); assertThat(violation.getResourceQualifier(), is("CLA")); assertThat(violation.getResourceScope(), is("FIL")); - assertThat(violation.isFalsePositive(), is(false)); + assertThat(violation.isSwitchedOff(), is(false)); assertThat(violation.getReviewId(), nullValue()); } @@ -67,9 +67,9 @@ public class ViolationUnmarshallerTest extends UnmarshallerTestCase { } @Test - public void testFalsePositive() { + public void testSwitchedOff() { Violation violation = new ViolationUnmarshaller().toModel(loadFile("/violations/false-positive.json")); - assertThat(violation.isFalsePositive(), is(true)); + assertThat(violation.isSwitchedOff(), is(true)); assertThat(violation.getReviewId(), is(123L)); } diff --git a/sonar-ws-client/src/test/resources/violations/false-positive.json b/sonar-ws-client/src/test/resources/violations/false-positive.json index d84cb1528d5..2165e9455c1 100644 --- a/sonar-ws-client/src/test/resources/violations/false-positive.json +++ b/sonar-ws-client/src/test/resources/violations/false-positive.json @@ -1,3 +1,3 @@ [ - {"message":"throw java.lang.Exception","falsePositive": true, "review": 123, "priority":"MAJOR","rule":{"key":"pmd:SignatureDeclareThrowsException","name":"Signature Declare Throws Exception","category":"Maintainability"},"resource":{"key":"org.apache.excalibur.components:excalibur-pool-instrumented:org.apache.avalon.excalibur.pool.TraceableResourceLimitingPool","name":"TraceableResourceLimitingPool","scope":"FIL","qualifier":"CLA","language":"java"}} + {"message":"throw java.lang.Exception","switchedOff": true, "review": 123, "priority":"MAJOR","rule":{"key":"pmd:SignatureDeclareThrowsException","name":"Signature Declare Throws Exception","category":"Maintainability"},"resource":{"key":"org.apache.excalibur.components:excalibur-pool-instrumented:org.apache.avalon.excalibur.pool.TraceableResourceLimitingPool","name":"TraceableResourceLimitingPool","scope":"FIL","qualifier":"CLA","language":"java"}} ] \ No newline at end of file -- 2.39.5