Fix quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java
index 167755c60d982f4ef25c1945b48328b0e4fcc250..deb747d94e430bf0500598b633c4ca2b4946fa2c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/IssueLifecycle.java
@@ -92,8 +92,8 @@ public class IssueLifecycle {
     updater.setPastLine(raw, base.getLine());
     updater.setPastLocations(raw, base.getLocations());
     updater.setPastMessage(raw, base.getMessage(), changeContext);
-    updater.setPastGap(raw, base.effortToFix(), changeContext);
-    updater.setPastEffort(raw, base.debt(), changeContext);
+    updater.setPastGap(raw, base.gap(), changeContext);
+    updater.setPastEffort(raw, base.effort(), changeContext);
     raw.setSelectedAt(base.selectedAt());
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitor.java
index 6860cc81b473c4dc4da09adcc616ab312d6db1c6..747a2a108d21c7a0e742bb54bcfb7f0136b0601e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitor.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/qualitymodel/QualityModelMeasuresVisitor.java
@@ -311,9 +311,9 @@ public class QualityModelMeasuresVisitor extends PathAwareVisitorAdapter<Quality
     }
 
     private static long getEffortForNotMinorIssue(Issue issue) {
-      Duration debt = issue.debt();
-      if (!issue.severity().equals(Severity.INFO) && debt != null) {
-        return debt.toMinutes();
+      Duration effort = issue.effort();
+      if (!issue.severity().equals(Severity.INFO) && effort != null) {
+        return effort.toMinutes();
       }
       return 0L;
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java
index a059de34514a368c4401f55343f19959c14c5612..98ed3a10794c865c90ca01130fa1f743cd420c75 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java
@@ -188,10 +188,10 @@ public class PersistSnapshotsStep implements ComputationStep {
     private void addToCache(Component component, SnapshotDto snapshotDto) {
       dbIdsRepository.setSnapshotId(component, snapshotDto.getId());
     }
-  }
 
-  private void persist(SnapshotDto snapshotDto, DbSession dbSession) {
-    dbClient.snapshotDao().insert(dbSession, snapshotDto);
+    private void persist(SnapshotDto snapshotDto, DbSession dbSession) {
+      dbClient.snapshotDao().insert(dbSession, snapshotDto);
+    }
   }
 
   private static String getFileQualifier(Component component) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java b/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java
index 1182058e3125acdca66d52a56cbd3090dd60844b..6e9ad5d02802d60a7e9976404671e848ac648f22 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java
@@ -163,7 +163,7 @@ public class DefaultRuleFinder implements RuleFinder {
     return rules;
   }
 
-  private org.sonar.api.rules.Rule toRule(RuleDto rule, List<RuleParamDto> params) {
+  private static org.sonar.api.rules.Rule toRule(RuleDto rule, List<RuleParamDto> params) {
     String severity = rule.getSeverityString();
     String description = rule.getDescription();
     RuleDto.Format descriptionFormat = rule.getDescriptionFormat();

diff --git a/sonar-db/src/main/java/org/sonar/db/component/ResourceDao.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceDao.java
index c68302f8a4a0178f195d522ec0554b2c35c5bddf..4624d3cf94dc48b75a18324511859d200e982955 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/component/ResourceDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceDao.java
@@ -64,7 +64,7 @@ public class ResourceDao extends AbstractDao {
     return null;
   }
 
-  private List<ResourceDto> getResources(ResourceQuery query, SqlSession session) {
+  private static List<ResourceDto> getResources(ResourceQuery query, SqlSession session) {
     return session.getMapper(ResourceMapper.class).selectResources(query);
   }
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java
index 130586594117bc377465954dc62aa43174b84696..9be365feb299ad3c7cf72c30fb92fa9a2909cdbd 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionAnnotationLoader.java
@@ -74,7 +74,7 @@ public class RulesDefinitionAnnotationLoader {
     }
   }
 
-  private RulesDefinition.NewRule loadRule(RulesDefinition.NewExtendedRepository repo, Class clazz, org.sonar.check.Rule ruleAnnotation) {
+  private static RulesDefinition.NewRule loadRule(RulesDefinition.NewExtendedRepository repo, Class clazz, org.sonar.check.Rule ruleAnnotation) {
     String ruleKey = StringUtils.defaultIfEmpty(ruleAnnotation.key(), clazz.getCanonicalName());
     String ruleName = StringUtils.defaultIfEmpty(ruleAnnotation.name(), null);
     String description = StringUtils.defaultIfEmpty(ruleAnnotation.description(), null);

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionXmlLoader.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionXmlLoader.java
index 996a044d19b395205842b05c2090e760f4a6d0bf..6ee19d515bd47ca351a47c8d0bc209508acc46c6 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionXmlLoader.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinitionXmlLoader.java
@@ -232,7 +232,7 @@ public class RulesDefinitionXmlLoader {
     }
   }
 
-  private void processRule(RulesDefinition.NewRepository repo, SMInputCursor ruleC) throws XMLStreamException {
+  private static void processRule(RulesDefinition.NewRepository repo, SMInputCursor ruleC) throws XMLStreamException {
     String key = null;
     String name = null;
     String description = null;