Fix some quality flaws

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 d54c8761c6e258dcdd9be3136d76df91b036a60b..c7577ffd83b0772a9a511be63a391d22bc647f54 100644 (file)
--- 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 5c9c3eccdf0eea5fa4b7d0007b7a8fb533b6fc71..b9b1b44be9db3b1328b7ae563338155af9931cc5 100644 (file)
--- 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 a9aceeacbdf4d9a3137883906b13686248c923a5..f51b1218c6109e21e9b860bf3aca3e4e7a0b4196 100644 (file)
--- 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<PurgeableSnapshotDto> {
   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<PurgeableSnapshotDto> {
   }
 
   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 24d6a04ddf16987cdce7adeb7751f6b0e9aa6e33..66148d5fba0c64dfa66a4b08aaa0520d3987f79c 100644 (file)
--- 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 f211be6aac3321cb18a26dfe7cf84221e871cb8e..7b0020b4c5af5c86628ae35cde6f8054a1be7f28 100644 (file)
--- 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 b1144d9a6dad86c2997b27304e01885ffaa6aa4b..de31a05223849d5269f4b7917b1aea18d07eb1af 100644 (file)
--- 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 @@
       <if test="resourceId != null">
         and s.project_id=#{resourceId}
       </if>
-      <if test="beforeBuildDate != null">
-        and s.build_date &lt;= #{beforeBuildDate}
-      </if>
       <if test="status != null">
         and s.status in
         <foreach item="s" index="index" collection="status" open="(" separator="," close=")">#{s}</foreach>

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 0da76ee17f28c904e5740e875ac5a2787e38937b..409fc34b7308da0b6d7c45a5fb87f9a1c11318ff 100644 (file)
--- 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;