Fix quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java b/server/sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java
index 9180dbf027d36088b1a58b1fcd6e239eebe74bb9..744a3c05fd67ce08165f2f2d75a48d970f191ba8 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/activity/RubyQProfileActivityService.java
@@ -69,7 +69,7 @@ public class RubyQProfileActivityService implements ServerComponent, Startable {
     queryContext.setPage(pageIndex, 50);
 
     Result<QProfileActivity> result = service.searchActivities(query, queryContext);
-    return new QProfileActivityResult(result.getHits(), Paging.create(queryContext.getLimit(), pageIndex, Long.valueOf(result.getTotal()).intValue()));
+    return new QProfileActivityResult(result.getHits(), Paging.create(queryContext.getLimit(), pageIndex, (int) result.getTotal()));
   }
 
   @Override

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java
index 68139b8e5521ca6848142900c1eef89920e3e486..68db56a5fe2254df15fa56c7d9d9797f7de4bcab 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/BaseDoc.java
@@ -25,6 +25,8 @@ import javax.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
 
+import static com.google.common.collect.Maps.newHashMap;
+
 /**
  * Base implementation for business objects based on elasticsearch document
  */
@@ -32,6 +34,10 @@ public abstract class BaseDoc {
 
   protected final Map<String, Object> fields;
 
+  protected BaseDoc() {
+    this.fields = newHashMap();
+  }
+
   protected BaseDoc(Map<String, Object> fields) {
     this.fields = fields;
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index bc7821588c4a245b47c2696090f1599f29bbf138..460e7b2ff484c1adddbc5646a9ae020ad87dc293 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -129,16 +129,15 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
 
       @Override
       public DOMAIN next() {
-        if (hits.isEmpty()) {
-          fillQueue();
+        if (!hasNext()) {
+          throw new NoSuchElementException();
         }
         return toDoc(hits.poll().getSource());
       }
 
       @Override
       public void remove() {
-        throw new IllegalStateException("Cannot remove item from scroll Iterable!!!" +
-          " Use Service or DAO classes instead");
+        throw new UnsupportedOperationException("Cannot remove item from scroll");
       }
     };
   }
@@ -195,7 +194,7 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
       .setQuery(QueryBuilders.filteredQuery(
         QueryBuilders.matchAllQuery(),
         getLastSynchronizationBuilder(params)
-      ))
+        ))
       .setSize(0)
       .addAggregation(AggregationBuilders.max("latest")
         .field(BaseNormalizer.UPDATED_AT_FIELD));
@@ -204,7 +203,7 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
 
     Max max = response.getAggregations().get("latest");
     if (max.getValue() > 0) {
-      Date date = new DateTime(Double.valueOf(max.getValue()).longValue()).toDate();
+      Date date = new DateTime((long) max.getValue()).toDate();
       LOG.debug("Index {}:{} has last update of {}", this.getIndexName(), this.getIndexType(), date);
       return date;
     } else {

diff --git a/sonar-batch/src/main/java/org/sonar/batch/debt/SqaleRatingDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/debt/SqaleRatingDecorator.java
index 426ba550e728a35561d02e7e616e724ca1a6b00f..2e3a6348466fa3e8b400c897ef39296cbce7f6d1 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/debt/SqaleRatingDecorator.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/debt/SqaleRatingDecorator.java
@@ -44,7 +44,7 @@ import java.util.List;
 /**
  * Decorator that computes Sqale Rating metric
  */
-public final class SqaleRatingDecorator implements Decorator {
+public class SqaleRatingDecorator implements Decorator {
 
   private final SqaleRatingSettings sqaleRatingSettings;
   private final Metric[] metrics;

diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java b/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java
index 2e3b9a0debde4633c481bc5b908680a14802daea..4ec0d8db26db1c368907146665b2d85598d45d31 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java
+++ b/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java
@@ -52,15 +52,15 @@ class DurationLabel {
     } else if (nbHours < 48) {
       return message("day");
     } else if (nbDays < 30) {
-      return message("days", Double.valueOf(Math.floor(nbDays)).longValue());
+      return message("days", (long)(Math.floor(nbDays)));
     } else if (nbDays < 60) {
       return message( "month");
     } else if (nbDays < 365) {
-      return message("months", Double.valueOf(Math.floor(nbDays / 30)).longValue());
+      return message("months", (long)(Math.floor(nbDays / 30)));
     } else if (nbYears < 2) {
       return message("year");
     }
-    return message("years", Double.valueOf(Math.floor(nbYears)).longValue());
+    return message("years", (long)(Math.floor(nbYears)));
   }
 
   private static Result message(String key) {

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
index 2d97a4160d76a0cf78c18cb7beafe5aaf8b35dc3..59e6e4b10c37fcde8f13287b3559e2b02f307207 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java
@@ -23,7 +23,7 @@ import org.apache.ibatis.annotations.Param;
 import org.sonar.core.rule.RuleDto;
 
 import javax.annotation.Nullable;
-import java.util.Date;
+
 import java.util.List;
 
 public interface IssueMapper {