SONAR-7345 Rename ISSUES columns

Rename technical_debt to effort
Rename effort_to_fix to gap

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java
index 153ab8200c907daae5b97c9818cea3b698b573b7..394e458cdd346c0efdeca9eb5baeeadae5c5e2de 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java
@@ -63,7 +63,7 @@ public class UpdateConflictResolver {
   }
 
   private void resolveEffortToFix(IssueDto dbIssue, DefaultIssue issue) {
-    issue.setEffortToFix(dbIssue.getEffortToFix());
+    issue.setEffortToFix(dbIssue.getGap());
   }
 
   private void resolveSeverity(IssueDto dbIssue, DefaultIssue issue) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java
index 3d6ca4007193a5ef16df5d4336cd20731d2f4f56..3a7c6f3375c7c90fa4ddc3ba55b3028c68337190 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java
@@ -55,7 +55,7 @@ class IssueResultSetIterator extends ResultSetIterator<IssueDoc> {
     "i.updated_at",
     "i.action_plan_key",
     "i.assignee",
-    "i.effort_to_fix",
+    "i.gap",
     "i.issue_attributes",
     "i.line",
     "i.message",
@@ -66,7 +66,7 @@ class IssueResultSetIterator extends ResultSetIterator<IssueDoc> {
     "i.manual_severity",
     "i.checksum",
     "i.status",
-    "i.technical_debt",
+    "i.effort",
     "i.reporter",
     "i.author_login",
     "i.issue_close_date",

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
index acba54dac136e1ab1499f43871e1ff3c7ef9354f..25a6f08f1ef1556873bc64f886bf1eda288bf53a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
@@ -178,7 +178,7 @@ public class SearchResponseFormat {
     }
     issueBuilder.setMessage(nullToEmpty(dto.getMessage()));
     issueBuilder.addAllTags(dto.getTags());
-    Long debt = dto.getDebt();
+    Long debt = dto.getEffort();
     if (debt != null) {
       issueBuilder.setDebt(durations.encode(Duration.create(debt)));
     }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java
index c0535f917a110c487f226b02291c896fdcaf8f10..b9a4f8b097b4e7d9af039224e389c3099eae7e54 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java
@@ -52,7 +52,7 @@ public class IssueTesting {
       .setStatus(Issue.STATUS_OPEN)
       .setResolution(null)
       .setSeverity(Severity.MAJOR)
-      .setDebt(10L)
+      .setEffort(10L)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2014-12-04"))
       .setCreatedAt(1400000000000L)

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
index 1d357708df297c1db45a0d73b097a5c61eca26e7..41030157085b67bce87cb259c613f2c03a35b853 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java
@@ -117,7 +117,7 @@ public class SearchActionMediumTest {
     ComponentDto file = insertComponent(ComponentTesting.newFileDto(project, "FILE_ID").setKey("FILE_KEY"));
     IssueDto issue = IssueTesting.newDto(newRule(), file, project)
       .setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")
-      .setDebt(10L)
+      .setEffort(10L)
       .setMessage("the message")
       .setStatus(Issue.STATUS_RESOLVED)
       .setResolution(Issue.RESOLUTION_FIXED)
@@ -347,7 +347,7 @@ public class SearchActionMediumTest {
     IssueDto issue = IssueTesting.newDto(newRule(), file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")
       .setSeverity("MAJOR");
@@ -371,7 +371,7 @@ public class SearchActionMediumTest {
     IssueDto issue = IssueTesting.newDto(newRule(), file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")
       .setSeverity("MAJOR");
@@ -396,7 +396,7 @@ public class SearchActionMediumTest {
     IssueDto issue = IssueTesting.newDto(newRule(), file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")
       .setSeverity("MAJOR");
@@ -425,7 +425,7 @@ public class SearchActionMediumTest {
     IssueDto issue1 = IssueTesting.newDto(rule, file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")
       .setSeverity("MAJOR")
@@ -433,7 +433,7 @@ public class SearchActionMediumTest {
     IssueDto issue2 = IssueTesting.newDto(rule, file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("7b112bd4-b650-4037-80bc-82fd47d4eac2")
       .setSeverity("MAJOR")
@@ -441,7 +441,7 @@ public class SearchActionMediumTest {
     IssueDto issue3 = IssueTesting.newDto(rule, file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("82fd47d4-4037-b650-80bc-7b112bd4eac2")
       .setSeverity("MAJOR");
@@ -499,7 +499,7 @@ public class SearchActionMediumTest {
     IssueDto issue1 = IssueTesting.newDto(rule, file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("82fd47d4-b650-4037-80bc-7b112bd4eac2")
       .setSeverity("MAJOR")
@@ -507,7 +507,7 @@ public class SearchActionMediumTest {
     IssueDto issue2 = IssueTesting.newDto(rule, file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("7b112bd4-b650-4037-80bc-82fd47d4eac2")
       .setSeverity("MAJOR")
@@ -515,7 +515,7 @@ public class SearchActionMediumTest {
     IssueDto issue3 = IssueTesting.newDto(rule, file, project)
       .setIssueCreationDate(DateUtils.parseDate("2014-09-04"))
       .setIssueUpdateDate(DateUtils.parseDate("2017-12-04"))
-      .setDebt(10L)
+      .setEffort(10L)
       .setStatus("OPEN")
       .setKee("82fd47d4-4037-b650-80bc-7b112bd4eac2")
       .setSeverity("MAJOR");

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml
index f99404e0b841a2737bf551c863e03e055b88b324..c9fcff4c6ce4f92760f64555dd827d1464ad4737 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml
@@ -10,8 +10,8 @@
       manual_severity="[false]"
       message="[null]"
       line="[null]"
-      effort_to_fix="[null]"
-      technical_debt="[null]"
+      gap="[null]"
+      effort="[null]"
       status="CLOSED"
       resolution="FIXED"
       checksum="[null]"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
index d9425fac75d6ba8934c06c6d4a1d487d5d06025a..450f750caf092ed6d43a694392f164a33904dae7 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
@@ -21,8 +21,8 @@
       manual_severity="[false]"
       message="[null]"
       line="[null]"
-      effort_to_fix="[null]"
-      technical_debt="[null]"
+      gap="[null]"
+      effort="[null]"
       status="OPEN"
       resolution="[null]"
       checksum="[null]"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
index 47a64e727e1fbb5e122e0e44256eff1f9f986be5..4cc182d5a66811e60d96f95837e858ae61749af2 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
@@ -3,8 +3,8 @@
           assignee="[null]"
           author_login="[null]"
           checksum="[null]"
-          effort_to_fix="[null]"
-          technical_debt="10"
+          gap="[null]"
+          effort="10"
           message="[null]"
           line="5000"
           component_uuid="uuid-100"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
index cf4bf606187377f35acc211cc161c58332704633..2cbf82aca1ac1d5b761a3733244eb024154e2b58 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml
@@ -14,8 +14,8 @@
           assignee="winner"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="444"
           component_uuid="uuid-100"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml
index e1b2e8f4cf179d5cc1a026c44a422a77c32cef5d..7afaddfa8b4c4f3c7f6cf989eb1cc5d95065e596 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml
@@ -16,8 +16,8 @@
           manual_severity="[false]"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="1"
           component_uuid="uuid-100"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
index f29278e59ae592612378b46cafebe90e86e5cf74..27e6a2aa6c2e469fe18ee99e38f1777fb76a49a9 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
@@ -8,8 +8,8 @@
           assignee="loic"
           author_login="simon"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="10"
+          gap="[null]"
+          effort="10"
           message="[null]"
           line="5000"
           component_uuid="uuid-100"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
index 3617769b872ceceb953fc169c6d60f685c9c5176..6983f83239312df264f46522cddd9234e9d2589a 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
@@ -8,8 +8,8 @@
           assignee="loic"
           author_login="simon"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="3000"
           component_uuid="uuid-100"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
index 6e6bba1dc508240f2ec70a47715705811fe379a0..0e12196051ff8f823f9f6ab1d9e80f83f6d876e8 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
@@ -3,8 +3,8 @@
           assignee="[null]"
           author_login="[null]"
           checksum="[null]"
-          effort_to_fix="[null]"
-          technical_debt="10"
+          gap="[null]"
+          effort="10"
           message="[null]"
           line="5000"
           component_uuid="BCDE"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
index 35fda9aeac0ac0141a6afa8405d4caf1db1dc328..c02840c9fd889b8184889951409b714e19d50273 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml
@@ -8,8 +8,8 @@
           assignee="loic"
           author_login="simon"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="10"
+          gap="[null]"
+          effort="10"
           message="[null]"
           line="5000"
           component_uuid="BCDE"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
index c57d71c333ef5d1ec65e01bb9fa8245699a7d126..f78e4ce93436c2bab528f5d87ff7c7a5b6e36e57 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
@@ -15,8 +15,8 @@
           assignee="loic"
           author_login="simon"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="3000"
           component_uuid="BCDE"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml
index 942bd4a30cc8fd79f4ff31874e8f21e079e57367..dcc1e50070dded8766806c13e27e88bcd93bb61a 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml
@@ -17,8 +17,8 @@
           assignee="winner"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="444"
           component_uuid="THE_FILE"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml
index 098f110a70a8b944a163b14ec330f439da0974a9..5d57824f80deeea26ca95dace0807218392c90d0 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml
@@ -18,8 +18,8 @@
           assignee="winner"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="444"
           component_uuid="THE_FILE_1"
@@ -53,8 +53,8 @@
           assignee="winner"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="444"
           component_uuid="THE_FILE_2"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml
index 938137b4782308667344651450b9aa36ad8b0cc0..c68a82fb8c8181cf8e9f5de5ab1cfa6999971a29 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml
@@ -17,8 +17,8 @@
       assignee="guy1"
       author_login="guy2"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="10"
+      gap="[null]"
+      effort="10"
       message="[null]"
       line="444"
       component_uuid="FILE"
@@ -46,8 +46,8 @@
       assignee="guy2"
       author_login="[null]"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="15"
+      gap="[null]"
+      effort="15"
       message="[null]"
       line="444"
       component_uuid="ROOT_FILE"
@@ -75,8 +75,8 @@
       assignee="guy2"
       author_login="[null]"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="15"
+      gap="[null]"
+      effort="15"
       message="[null]"
       line="[null]"
       component_uuid="PROJECT"
@@ -104,8 +104,8 @@
       assignee="guy2"
       author_login="[null]"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="15"
+      gap="[null]"
+      effort="15"
       message="[null]"
       line="[null]"
       component_uuid="MODULE"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml
index 938137b4782308667344651450b9aa36ad8b0cc0..c68a82fb8c8181cf8e9f5de5ab1cfa6999971a29 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml
@@ -17,8 +17,8 @@
       assignee="guy1"
       author_login="guy2"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="10"
+      gap="[null]"
+      effort="10"
       message="[null]"
       line="444"
       component_uuid="FILE"
@@ -46,8 +46,8 @@
       assignee="guy2"
       author_login="[null]"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="15"
+      gap="[null]"
+      effort="15"
       message="[null]"
       line="444"
       component_uuid="ROOT_FILE"
@@ -75,8 +75,8 @@
       assignee="guy2"
       author_login="[null]"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="15"
+      gap="[null]"
+      effort="15"
       message="[null]"
       line="[null]"
       component_uuid="PROJECT"
@@ -104,8 +104,8 @@
       assignee="guy2"
       author_login="[null]"
       checksum="FFFFF"
-      effort_to_fix="[null]"
-      technical_debt="15"
+      gap="[null]"
+      effort="15"
       message="[null]"
       line="[null]"
       component_uuid="MODULE"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/many_projects.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/many_projects.xml
index a5ec593268fb72a57d29ae9cd88b1606d08dd439..3a568be54c883669085957333cb41ff81f1cb332 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/many_projects.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/many_projects.xml
@@ -18,8 +18,8 @@
           assignee="winner"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="444"
           component_uuid="THE_FILE_1"
@@ -46,8 +46,8 @@
           assignee="winner"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="444"
           component_uuid="THE_FILE_1"
@@ -81,8 +81,8 @@
           assignee="winner"
           author_login="[null]"
           checksum="FFFFF"
-          effort_to_fix="[null]"
-          technical_debt="[null]"
+          gap="[null]"
+          effort="[null]"
           message="[null]"
           line="444"
           component_uuid="THE_FILE_2"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml
index 374d2b24f0815ffb9aa14419e900184fc43bb738..5b8f3cd046c6e55d67ce55024e3d2e559472fe5e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml
@@ -17,8 +17,8 @@
       assignee="guy1"
       author_login="guy2"
       checksum="FFFFF"
-      effort_to_fix="2"
-      technical_debt="10"
+      gap="2"
+      effort="10"
       message="[null]"
       line="444"
       component_uuid="FILE1"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml
index 6939692204f2eb8d423f087bc3ca669626fffd36..b48d250acaa6bacafc735aa3805a39aa015cb831 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml
@@ -17,8 +17,8 @@
     assignee="guy1"
     author_login="guy2"
     checksum="FFFFF"
-    effort_to_fix="[null]"
-    technical_debt="10"
+    gap="[null]"
+    effort="10"
     message="[null]"
     line="444"
     component_uuid="FILE1"
@@ -47,8 +47,8 @@
     assignee="guy1"
     author_login="guy2"
     checksum="FFFFF"
-    effort_to_fix="[null]"
-    technical_debt="10"
+    gap="[null]"
+    effort="10"
     message="[null]"
     line="444"
     component_uuid="MODULE1"
@@ -77,8 +77,8 @@
     assignee="guy2"
     author_login="[null]"
     checksum="FFFFF"
-    effort_to_fix="[null]"
-    technical_debt="15"
+    gap="[null]"
+    effort="15"
     message="[null]"
     line="444"
     component_uuid="FILE1"
@@ -107,8 +107,8 @@
     assignee="guy1"
     author_login="guy2"
     checksum="FFFFF"
-    effort_to_fix="[null]"
-    technical_debt="10"
+    gap="[null]"
+    effort="10"
     message="[null]"
     line="444"
     component_uuid="DIR1"

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1116_rename_issues_debt_and_effort_to_fix_columns.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1116_rename_issues_debt_and_effort_to_fix_columns.rb
new file mode 100644 (file)
index 0000000..8789d59
--- /dev/null
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1116_rename_issues_debt_and_effort_to_fix_columns.rb
@@ -0,0 +1,33 @@
+#
+# SonarQube, open source software quality management tool.
+# Copyright (C) 2008-2014 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# SonarQube is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# SonarQube is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+#
+# SonarQube 5.5
+# SONAR-7345
+#
+class RenameIssuesDebtAndEffortToFixColumns < ActiveRecord::Migration
+
+  def self.up
+    rename_column 'issues', 'technical_debt', 'effort'
+    rename_column 'issues', 'effort_to_fix', 'gap'
+  end
+
+end
+

diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
index ce380e8e86c4a372278ae26b54798ff888497f24..1afe96c55c5398fa19182acdc09d397d96b876c2 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
@@ -64,8 +64,8 @@ public final class IssueDto implements Serializable {
   private boolean manualSeverity;
   private String message;
   private Integer line;
-  private Double effortToFix;
-  private Long debt;
+  private Double gap;
+  private Long effort;
   private String status;
   private String resolution;
   private String checksum;
@@ -109,8 +109,8 @@ public final class IssueDto implements Serializable {
       .setLine(issue.line())
       .setLocations((DbIssues.Locations) issue.getLocations())
       .setMessage(issue.message())
-      .setEffortToFix(issue.effortToFix())
-      .setDebt(issue.debtInMinutes())
+      .setGap(issue.effortToFix())
+      .setEffort(issue.debtInMinutes())
       .setResolution(issue.resolution())
       .setStatus(issue.status())
       .setSeverity(issue.severity())
@@ -158,8 +158,8 @@ public final class IssueDto implements Serializable {
       .setLine(issue.line())
       .setLocations((DbIssues.Locations) issue.getLocations())
       .setMessage(issue.message())
-      .setEffortToFix(issue.effortToFix())
-      .setDebt(issue.debtInMinutes())
+      .setGap(issue.effortToFix())
+      .setEffort(issue.debtInMinutes())
       .setResolution(issue.resolution())
       .setStatus(issue.status())
       .setSeverity(issue.severity())
@@ -297,24 +297,24 @@ public final class IssueDto implements Serializable {
   }
 
   @CheckForNull
-  public Double getEffortToFix() {
-    return effortToFix;
+  public Double getGap() {
+    return gap;
   }
 
-  public IssueDto setEffortToFix(@Nullable Double d) {
+  public IssueDto setGap(@Nullable Double d) {
     checkArgument(d == null || d >= 0, "Value of issue effort to fix must be positive: %d", d);
-    this.effortToFix = d;
+    this.gap = d;
     return this;
   }
 
   @CheckForNull
-  public Long getDebt() {
-    return debt;
+  public Long getEffort() {
+    return effort;
   }
 
-  public IssueDto setDebt(@Nullable Long l) {
+  public IssueDto setEffort(@Nullable Long l) {
     checkArgument(l == null || l >= 0, "Value of issue debt must be positive: %d", l);
-    this.debt = l;
+    this.effort = l;
     return this;
   }
 
@@ -726,8 +726,8 @@ public final class IssueDto implements Serializable {
     issue.setStatus(status);
     issue.setResolution(resolution);
     issue.setMessage(message);
-    issue.setEffortToFix(effortToFix);
-    issue.setDebt(debt != null ? Duration.create(debt) : null);
+    issue.setEffortToFix(gap);
+    issue.setDebt(effort != null ? Duration.create(effort) : null);
     issue.setLine(line);
     issue.setChecksum(checksum);
     issue.setSeverity(severity);

diff --git a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
index b0c7ac94eb85b0d4fe90a98881cc907e342e2937..8cdd6772ce2de9bbedb855e9cfced00de976316b 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
@@ -29,7 +29,7 @@ import org.sonar.db.MyBatis;
 
 public class DatabaseVersion {
 
-  public static final int LAST_VERSION = 1115;
+  public static final int LAST_VERSION = 1116;
 
   /**
    * The minimum supported version which can be upgraded. Lower

diff --git a/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml
index ff137839e05e52337b0b7448ed0834468e11a655..63b2c3887816e287873a2186f41be1f39d4c739c 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml
@@ -14,8 +14,8 @@
     i.message as message,
     i.line as line,
     i.locations as locations,
-    i.effort_to_fix as effortToFix,
-    i.technical_debt as debt,
+    i.gap as gap,
+    i.effort as effort,
     i.status as status,
     i.resolution as resolution,
     i.checksum as checksum,
@@ -69,14 +69,14 @@
 
   <insert id="insert" parameterType="Issue" useGeneratedKeys="false" keyProperty="id">
     INSERT INTO issues (kee, rule_id, action_plan_key, severity, manual_severity,
-    message, line, locations, effort_to_fix, technical_debt, status, tags,
+    message, line, locations, gap, effort, status, tags,
     resolution, checksum, reporter, assignee, author_login, issue_attributes, issue_creation_date, issue_update_date,
     issue_close_date, created_at, updated_at, component_uuid, project_uuid, issue_type)
     VALUES (#{kee,jdbcType=VARCHAR}, #{ruleId,jdbcType=INTEGER}, #{actionPlanKey,jdbcType=VARCHAR},
     #{severity,jdbcType=VARCHAR},
     #{manualSeverity,jdbcType=BOOLEAN}, #{message,jdbcType=VARCHAR}, #{line,jdbcType=INTEGER},
     #{locations,jdbcType=BINARY},
-    #{effortToFix,jdbcType=DOUBLE}, #{debt,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR},
+    #{gap,jdbcType=DOUBLE}, #{effort,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR},
     #{tagsString,jdbcType=VARCHAR}, #{resolution,jdbcType=VARCHAR}, #{checksum,jdbcType=VARCHAR},
     #{reporter,jdbcType=VARCHAR}, #{assignee,jdbcType=VARCHAR}, #{authorLogin,jdbcType=VARCHAR},
     #{issueAttributes,jdbcType=VARCHAR},
@@ -96,8 +96,8 @@
     message=#{message,jdbcType=VARCHAR},
     line=#{line,jdbcType=INTEGER},
     locations=#{locations,jdbcType=BINARY},
-    effort_to_fix=#{effortToFix,jdbcType=DOUBLE},
-    technical_debt=#{debt,jdbcType=INTEGER},
+    gap=#{gap,jdbcType=DOUBLE},
+    effort=#{effort,jdbcType=INTEGER},
     status=#{status,jdbcType=VARCHAR},
     resolution=#{resolution,jdbcType=VARCHAR},
     checksum=#{checksum,jdbcType=VARCHAR},
@@ -126,8 +126,8 @@
     message=#{message,jdbcType=VARCHAR},
     line=#{line,jdbcType=INTEGER},
     locations=#{locations,jdbcType=BINARY},
-    effort_to_fix=#{effortToFix,jdbcType=DOUBLE},
-    technical_debt=#{debt,jdbcType=INTEGER},
+    gap=#{gap,jdbcType=DOUBLE},
+    effort=#{effort,jdbcType=INTEGER},
     status=#{status,jdbcType=VARCHAR},
     resolution=#{resolution,jdbcType=VARCHAR},
     checksum=#{checksum,jdbcType=VARCHAR},
@@ -180,8 +180,8 @@
     i.message as message,
     i.line as line,
     i.locations as locations,
-    i.effort_to_fix as effortToFix,
-    i.technical_debt as debt,
+    i.gap as gap,
+    i.effort as effort,
     i.status as status,
     i.resolution as resolution,
     i.checksum as checksum,

diff --git a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
index f44bf0fccd10cda9e14db86d0e6e529534ba88d9..99f1f1b0bd7b0c4d226b9c0773de6d810dbb2d8e 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
+++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
@@ -393,6 +393,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1112');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1113');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1114');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1115');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1116');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;

diff --git a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index af42d8ac7a3bb86a552b18a442ca077313a86ff0..8a8677eb8ada308416fca5d29150965509d32408 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -403,8 +403,8 @@ CREATE TABLE "ISSUES" (
   "MANUAL_SEVERITY" BOOLEAN NOT NULL,
   "MESSAGE" VARCHAR(4000),
   "LINE" INTEGER,
-  "EFFORT_TO_FIX" DOUBLE,
-  "TECHNICAL_DEBT" INTEGER,
+  "GAP" DOUBLE,
+  "EFFORT" INTEGER,
   "STATUS" VARCHAR(20),
   "RESOLUTION" VARCHAR(20),
   "CHECKSUM" VARCHAR(1000),

diff --git a/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java
index c6b6f214611ef301e4d265e485c7d021ea576d25..26cfaecff5553bb51854d0191200763cc1ed3e26 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.System2;
+import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
 import org.sonar.db.RowNotFoundException;
 import org.sonar.db.component.ComponentDto;
@@ -114,7 +115,8 @@ public class IssueDaoTest {
     assertThat(issue.isManualSeverity()).isFalse();
     assertThat(issue.getMessage()).isEqualTo("the message");
     assertThat(issue.getLine()).isEqualTo(500);
-    assertThat(issue.getEffortToFix()).isEqualTo(3.14);
+    assertThat(issue.getEffort()).isEqualTo(10L);
+    assertThat(issue.getGap()).isEqualTo(3.14);
     assertThat(issue.getStatus()).isEqualTo("RESOLVED");
     assertThat(issue.getResolution()).isEqualTo("FIXED");
     assertThat(issue.getChecksum()).isEqualTo("123456789");
@@ -185,7 +187,7 @@ public class IssueDaoTest {
     assertThat(issue.isManualSeverity()).isFalse();
     assertThat(issue.getMessage()).isNull();
     assertThat(issue.getLine()).isEqualTo(200);
-    assertThat(issue.getEffortToFix()).isEqualTo(4.2);
+    assertThat(issue.getGap()).isEqualTo(4.2);
     assertThat(issue.getStatus()).isEqualTo("OPEN");
     assertThat(issue.getResolution()).isEqualTo("FIXED");
     assertThat(issue.getChecksum()).isEqualTo("XXX");
@@ -212,8 +214,8 @@ public class IssueDaoTest {
     dto.setKee(key);
     dto.setType(2);
     dto.setLine(500);
-    dto.setEffortToFix(3.14);
-    dto.setDebt(10L);
+    dto.setGap(3.14);
+    dto.setEffort(10L);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
     dto.setSeverity("BLOCKER");

diff --git a/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java
index 2707b2f9cd582e4e94077455b3c4a46e218ac29f..865f476f867bf3410faa73e0ad2a7b2a3d46fbdd 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java
@@ -71,8 +71,8 @@ public class IssueDtoTest {
       .setProjectKey("org.sonar.sample")
       .setStatus(Issue.STATUS_CLOSED)
       .setResolution(Issue.RESOLUTION_FALSE_POSITIVE)
-      .setEffortToFix(15.0)
-      .setDebt(10L)
+      .setGap(15.0)
+      .setEffort(10L)
       .setLine(6)
       .setSeverity("BLOCKER")
       .setMessage("message")

diff --git a/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java
index 812f5a7452b8daeaad69964d05c724dc8b1d6e76..4d3c379fea5b8b2995d480648e389433ed6deaeb 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java
@@ -44,8 +44,8 @@ public class IssueMapperTest {
     dto.setType(2);
     dto.setKee("ABCDE");
     dto.setLine(500);
-    dto.setEffortToFix(3.14);
-    dto.setDebt(10L);
+    dto.setGap(3.14);
+    dto.setEffort(10L);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
     dto.setSeverity("BLOCKER");
@@ -80,8 +80,8 @@ public class IssueMapperTest {
     dto.setType(3);
     dto.setKee("ABCDE");
     dto.setLine(500);
-    dto.setEffortToFix(3.14);
-    dto.setDebt(10L);
+    dto.setGap(3.14);
+    dto.setEffort(10L);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
     dto.setSeverity("BLOCKER");
@@ -116,8 +116,8 @@ public class IssueMapperTest {
     dto.setType(3);
     dto.setKee("ABCDE");
     dto.setLine(500);
-    dto.setEffortToFix(3.14);
-    dto.setDebt(10L);
+    dto.setGap(3.14);
+    dto.setEffort(10L);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
     dto.setSeverity("BLOCKER");
@@ -154,8 +154,8 @@ public class IssueMapperTest {
     dto.setRuleId(200);
     dto.setKee("ABCDE");
     dto.setLine(500);
-    dto.setEffortToFix(3.14);
-    dto.setDebt(10L);
+    dto.setGap(3.14);
+    dto.setEffort(10L);
     dto.setResolution("FIXED");
     dto.setStatus("RESOLVED");
     dto.setSeverity("BLOCKER");

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml
index 4644c4b315ec65a30c79d5a36428dcb97f406098..5119dd45c573457fe05c1f31cc625d003f49f2ce 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml
@@ -13,7 +13,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="[null]"
+    gap="[null]"
     checksum="[null]"
     reporter="user"
     assignee="user"
@@ -66,7 +66,7 @@
     manual_severity="[false]"
     message="[null]"
     line="120"
-    effort_to_fix="[null]"
+    gap="[null]"
     checksum="[null]"
     reporter="[null]"
     assignee="user"
@@ -105,7 +105,7 @@
     manual_severity="[false]"
     message="[null]"
     line="120"
-    effort_to_fix="[null]"
+    gap="[null]"
     checksum="[null]"
     reporter="[null]"
     assignee="user"
@@ -144,7 +144,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="[null]"
+    gap="[null]"
     checksum="[null]"
     reporter="user"
     assignee="user"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_by_action_plan.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_by_action_plan.xml
index 1cff4867ca098fe460f7292b5e1fcca3323480d6..7a280fa52b6d40674ff19cf7a163db5424de20ca 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_by_action_plan.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_by_action_plan.xml
@@ -10,7 +10,7 @@
       manual_severity="[false]"
       message="[null]"
       line="200"
-      effort_to_fix="4.2"
+      gap="4.2"
       status="OPEN"
       resolution="FIXED"
       checksum="XXX"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml
index fc563ef376a251857bfe43cd5036c9e432f066a5..35486efd650a468905bec25a866657fc510a2350 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml
@@ -11,7 +11,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="[null]"
     checksum="XXX"
@@ -37,7 +37,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="[null]"
     checksum="XXX"
@@ -65,7 +65,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="[null]"
     checksum="XXX"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
index 6fd8b2b30698b4b98eb723dc177a079b23263c0f..1aa94275af27fa8210bc6efcbb8cb6827fc386c6 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
@@ -11,7 +11,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="FIXED"
     checksum="XXX"
@@ -37,7 +37,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="FIXED"
     checksum="XXX"
@@ -65,7 +65,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="FIXED"
     checksum="XXX"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
index ec48c8b18551b882e15b7e642d76045d9db522dd..82aeab40ca13055f04e687848de218dce7cff57c 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
@@ -11,7 +11,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"
@@ -38,7 +38,7 @@
     manual_severity="[false]"
     message="[null]"
     line="120"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"
@@ -65,7 +65,7 @@
     manual_severity="[false]"
     message="[null]"
     line="120"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="CLOSED"
     resolution="FIXED"
     checksum="[null]"
@@ -92,7 +92,7 @@
     manual_severity="[false]"
     message="[null]"
     line="[null]"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"
@@ -119,7 +119,7 @@
     manual_severity="[false]"
     message="[null]"
     line="[null]"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
index 7d05f81ce7161e8112a400ad0cdac1d1daa16079..e48cccd9e4a8457bc86336ae2ef1de238ac43497 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
@@ -31,7 +31,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"
@@ -58,7 +58,7 @@
     manual_severity="[false]"
     message="[null]"
     line="120"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"
@@ -85,7 +85,7 @@
     manual_severity="[false]"
     message="[null]"
     line="120"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="CLOSED"
     resolution="FIXED"
     checksum="[null]"
@@ -112,7 +112,7 @@
     manual_severity="[false]"
     message="[null]"
     line="[null]"
-    effort_to_fix="[null]"
+    gap="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml
index 57a7c8e01912dadc2352d3d677f736aec9eb31f8..3c03568a481069ceded56c9534a812809fec2160 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml
@@ -9,8 +9,8 @@
       manual_severity="[false]"
       message="the message"
       line="500"
-      effort_to_fix="3.14"
-      technical_debt="10"
+      gap="3.14"
+      effort="10"
       status="RESOLVED"
       resolution="FIXED"
       checksum="123456789"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update.xml
index afd7cebe69087bf7bba9e3952e56bdc58da778eb..cb0d74e8b18cc26be7d03108d4a19eddac3aa9a4 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update.xml
@@ -9,8 +9,8 @@
       manual_severity="[false]"
       message="old"
       line="[null]"
-      effort_to_fix="[null]"
-      technical_debt="[null]"
+      gap="[null]"
+      effort="[null]"
       status="OPEN"
       resolution="[null]"
       checksum="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml
index 2f9d5a587091af46fe524831456dbf57ea696afe..1d1e874b079040b56144173dafa719a95fbe7d67 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml
@@ -9,8 +9,8 @@
     manual_severity="[false]"
     message="the message"
     line="500"
-    effort_to_fix="3.14"
-    technical_debt="10"
+    gap="3.14"
+    effort="10"
     status="RESOLVED"
     resolution="FIXED"
     checksum="123456789"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml
index 609e9bda87b525dacb78650fa5a6d0f7fc32b9b7..8e2a411de925e4c576557ee06bd47bb52bf74eef 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml
@@ -9,8 +9,8 @@
     manual_severity="[false]"
     message="the message"
     line="500"
-    effort_to_fix="3.14"
-    technical_debt="10"
+    gap="3.14"
+    effort="10"
     status="RESOLVED"
     resolution="FIXED"
     checksum="123456789"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml
index 54bf38bb28f84ced1e398198f2694b68bef6502b..6aed4c7508c92d6108ee60eacc5773def6e23f16 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml
@@ -9,8 +9,8 @@
     manual_severity="[false]"
     message="old"
     line="[null]"
-    effort_to_fix="[null]"
-    technical_debt="[null]"
+    gap="[null]"
+    effort="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml
index d35836a300613d46a12871abc53700549952df8d..09140f4849687c2875fa85218d3348122af59d61 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml
@@ -10,8 +10,8 @@
     manual_severity="[false]"
     message="old"
     line="[null]"
-    effort_to_fix="[null]"
-    technical_debt="[null]"
+    gap="[null]"
+    effort="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml
index b1de89b30676d7e0ecff3e01e4867a2252b9ee21..bd808bd1645b69ed72e10093eddba0fcb57a0246 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml
@@ -9,8 +9,8 @@
     manual_severity="[false]"
     message="old"
     line="[null]"
-    effort_to_fix="[null]"
-    technical_debt="[null]"
+    gap="[null]"
+    effort="[null]"
     status="OPEN"
     resolution="[null]"
     checksum="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
index 023402c8d1b7e8ffc9e7242a9f3e80c88bb92566..53ebfd57a66798da199c9f73fc10989bf68312a3 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
@@ -13,7 +13,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="FIXED"
     checksum="XXX"
@@ -39,7 +39,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="FIXED"
     checksum="XXX"
@@ -65,7 +65,7 @@
     manual_severity="[false]"
     message="[null]"
     line="200"
-    effort_to_fix="4.2"
+    gap="4.2"
     status="OPEN"
     resolution="FIXED"
     checksum="XXX"

diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml
index 0abcffe1af9fee6f2e0e2396059c35b08a0f689b..4f3f7f1c50b73794ff3ca5c366f9c63d8042ca0a 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml
@@ -71,7 +71,7 @@ What has been changed :
           issue_close_date="1396994400000"
           resolution="REMOVED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="1450000000000" issue_creation_date="1366063200000" issue_update_date="1396994400000"
           created_at="1450000000000" tags="[null]"
@@ -87,7 +87,7 @@ What has been changed :
           issue_close_date="1396994400000"
           resolution="REMOVED" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="1450000000000" issue_creation_date="1366063200000" issue_update_date="1396994400000"
           created_at="1450000000000" tags="[null]" locations="[null]"
@@ -101,7 +101,7 @@ What has been changed :
           issue_close_date="1396994400000"
           resolution="REMOVED" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="1450000000000" issue_creation_date="1366063200000" issue_update_date="1396994400000"
           created_at="1450000000000" tags="[null]" locations="[null]"
@@ -115,7 +115,7 @@ What has been changed :
           issue_close_date="1449529200000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="1450000000000" issue_creation_date="1366063200000" issue_update_date="1396908000000"
           created_at="1450000000000" tags="[null]" locations="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml
index d88f4f5d439815fc3316d738d5d43ff036e6c4a9..ce07ae13a7f275c258220f392a9b6db5a372ab4e 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml
@@ -63,7 +63,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1450000000000" locations="[null]"
@@ -77,7 +77,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1450000000000" locations="[null]"
@@ -91,7 +91,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1450000000000" locations="[null]"
@@ -105,7 +105,7 @@
           issue_close_date="1449529200000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="1450000000000" issue_creation_date="1366063200000" issue_update_date="1396908000000"
           created_at="1450000000000" locations="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
index 381c5993068ac1db484a385bd1843af6719be923..963b4d2ea2b7182fc9b6020a71a8a38d3dda364f 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml
@@ -30,7 +30,7 @@
           status="CLOSED"
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="2013-04-16"
           locations="[null]" />
   <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
@@ -41,7 +41,7 @@
           status="CLOSED"
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="2013-04-16" locations="[null]" locations="[null]"/>
   <issue_changes id="2" kee="[null]" issue_key="ISSUE-2" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
   -->
@@ -54,7 +54,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]" tags="[null]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -70,7 +70,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]" tags="[null]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -85,7 +85,7 @@
           status="CLOSED"
           issue_close_date="1735686000000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="2013-04-16" locations="[null]"/>
   <issue_changes id="5" kee="[null]" issue_key="ISSUE-5" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
   -->

diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
index 3daba8cc28722d5dea4dc205408cfbc13549ac06..d19f185d63b6e9fbd88d098ae9e239d0f43af2f1 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues.xml
@@ -25,7 +25,7 @@
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -40,7 +40,7 @@
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -57,7 +57,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -73,7 +73,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -88,7 +88,7 @@
           issue_close_date="1735686000000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
index bff1ed1ba8ee00beb43794d9b53bea402c78d48d..2739c7f10f6d95994386caab6d38d2b83bab529a 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml
@@ -24,7 +24,7 @@
           status="CLOSED"
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="2013-04-16" locations="[null]"/>
   <issue_changes id="1" kee="[null]" issue_key="ISSUE-1" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
 
@@ -34,7 +34,7 @@
           status="CLOSED"
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="2013-04-16" locations="[null]"/>
   <issue_changes id="2" kee="[null]" issue_key="ISSUE-2" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/>
   -->
@@ -47,7 +47,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]" tags="[null]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -63,7 +63,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]" tags="[null]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -78,7 +78,7 @@
           issue_close_date="1735686000000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]" tags="[null]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"

diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
index e44cbf283d157a14e987bca196330ac403d083f2..fe66971b590e0d2853a11c9ab463d2856402d6a0 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues.xml
@@ -24,7 +24,7 @@
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -39,7 +39,7 @@
           issue_close_date="1262300400000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"/>
@@ -55,7 +55,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -71,7 +71,7 @@
           issue_close_date="[null]"
           resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"
@@ -86,7 +86,7 @@
           issue_close_date="1735686000000"
           resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]"
+          message="[null]" action_plan_key="[null]" gap="[null]" effort="[null]"
           issue_attributes="[null]" checksum="[null]" author_login="[null]"
           updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000"
           created_at="1400000000000" locations="[null]"