From 9b3e2cc9103c5c0e7cdd4566e455e56b9d73b303 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 3 Feb 2012 10:29:04 +0100 Subject: [PATCH] Fix some quality flaws --- .../sonar/core/duplication/DuplicationDao.java | 1 - .../sonar/core/purge/PurgeSnapshotQuery.java | 18 +++--------------- .../sonar/core/purge/PurgeableSnapshotDto.java | 4 ++-- .../core/resource/ResourceIndexerDao.java | 1 - .../org/sonar/core/resource/SnapshotDto.java | 8 ++++---- .../org/sonar/core/purge/PurgeMapper.xml | 3 --- .../org/sonar/api/measures/RuleMeasure.java | 3 ++- 7 files changed, 11 insertions(+), 27 deletions(-) diff --git a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationDao.java b/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationDao.java index d54c8761c6e..c7577ffd83b 100644 --- a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationDao.java +++ b/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationDao.java @@ -19,7 +19,6 @@ */ package org.sonar.core.duplication; -import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.sonar.api.BatchComponent; import org.sonar.api.ServerComponent; diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeSnapshotQuery.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeSnapshotQuery.java index 5c9c3eccdf0..b9b1b44be9d 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeSnapshotQuery.java +++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeSnapshotQuery.java @@ -19,13 +19,10 @@ */ package org.sonar.core.purge; -import java.util.Date; - public final class PurgeSnapshotQuery { private Long rootProjectId; private Long rootSnapshotId; private Long resourceId; - private Date beforeBuildDate; private String[] scopes; private String[] qualifiers; private String[] status; @@ -49,17 +46,8 @@ public final class PurgeSnapshotQuery { return this; } - public Date getBeforeBuildDate() { - return beforeBuildDate; - } - - public PurgeSnapshotQuery setBeforeBuildDate(Date beforeBuildDate) { - this.beforeBuildDate = beforeBuildDate; - return this; - } - public String[] getScopes() { - return scopes; + return scopes;//NOSONAR May expose internal representation by returning reference to mutable object } public PurgeSnapshotQuery setScopes(String[] scopes) { @@ -68,7 +56,7 @@ public final class PurgeSnapshotQuery { } public String[] getQualifiers() { - return qualifiers; + return qualifiers;//NOSONAR May expose internal representation by returning reference to mutable object } public PurgeSnapshotQuery setQualifiers(String[] qualifiers) { @@ -77,7 +65,7 @@ public final class PurgeSnapshotQuery { } public String[] getStatus() { - return status; + return status;//NOSONAR May expose internal representation by returning reference to mutable object } public PurgeSnapshotQuery setStatus(String[] status) { diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeableSnapshotDto.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeableSnapshotDto.java index a9aceeacbdf..f51b1218c61 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeableSnapshotDto.java +++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeableSnapshotDto.java @@ -31,7 +31,7 @@ public class PurgeableSnapshotDto implements Comparable { private boolean isLast; public Date getDate() { - return date; + return date;//NOSONAR May expose internal representation by returning reference to mutable object } public long getSnapshotId() { @@ -47,7 +47,7 @@ public class PurgeableSnapshotDto implements Comparable { } public void setDate(Date date) { - this.date = date; + this.date = date;//NOSONAR May expose internal representation by incorporating reference to mutable object } public PurgeableSnapshotDto setSnapshotId(long snapshotId) { diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerDao.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerDao.java index 24d6a04ddf1..66148d5fba0 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerDao.java +++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerDao.java @@ -21,7 +21,6 @@ package org.sonar.core.resource; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; -import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.ResultContext; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.SqlSession; diff --git a/sonar-core/src/main/java/org/sonar/core/resource/SnapshotDto.java b/sonar-core/src/main/java/org/sonar/core/resource/SnapshotDto.java index f211be6aac3..7b0020b4c5a 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/SnapshotDto.java +++ b/sonar-core/src/main/java/org/sonar/core/resource/SnapshotDto.java @@ -67,20 +67,20 @@ public final class SnapshotDto { } public Date getDate() { - return date; + return date;//NOSONAR May expose internal representation by returning reference to mutable object } public SnapshotDto setDate(Date date) { - this.date = date; + this.date = date;// NOSONAR May expose internal representation by incorporating reference to mutable object return this; } public Date getBuildDate() { - return buildDate; + return buildDate;//NOSONAR May expose internal representation by returning reference to mutable object } public SnapshotDto setBuildDate(Date buildDate) { - this.buildDate = buildDate; + this.buildDate = buildDate;// NOSONAR May expose internal representation by incorporating reference to mutable object return this; } diff --git a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml b/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml index b1144d9a6da..de31a052238 100644 --- a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml @@ -21,9 +21,6 @@ and s.project_id=#{resourceId} - - and s.build_date <= #{beforeBuildDate} - and s.status in #{s} diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java index 0da76ee17f2..409fc34b730 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/RuleMeasure.java @@ -67,8 +67,9 @@ public class RuleMeasure extends Measure { } /** - * @deprecated since 2.14 use {@link #setSeverity()} instead. See SONAR-1829. + * @deprecated since 2.14 use {@link #setSeverity(org.sonar.api.rules.RulePriority)} instead. See SONAR-1829. */ + @Deprecated public RuleMeasure setRulePriority(RulePriority rulePriority) { this.rulePriority = rulePriority; return this; -- 2.39.5