summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java2
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResultSetIterator.java4
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java2
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java2
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java20
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/close_issue-result.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues-result.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml8
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_directory_path.xml16
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/extract_file_path.xml16
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/many_projects.xml12
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/one_issue.xml4
-rw-r--r--server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueResultSetIteratorTest/shared.xml16
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1116_rename_issues_debt_and_effort_to_fix_columns.rb33
-rw-r--r--sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java32
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java2
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml20
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql1
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl4
-rw-r--r--sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java10
-rw-r--r--sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java4
-rw-r--r--sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java16
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_by_action_plan.xml2
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml6
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml6
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml10
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml6
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml10
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues.xml10
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml10
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues.xml10
51 files changed, 217 insertions, 181 deletions
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 153ab8200c9..394e458cdd3 100644
--- 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 3d6ca400719..3a7c6f3375c 100644
--- 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 acba54dac13..25a6f08f1ef 100644
--- 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 c0535f917a1..b9a4f8b097b 100644
--- 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 1d357708df2..41030157085 100644
--- 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 f99404e0b84..c9fcff4c6ce 100644
--- 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 d9425fac75d..450f750caf0 100644
--- 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 47a64e727e1..4cc182d5a66 100644
--- 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 cf4bf606187..2cbf82aca1a 100644
--- 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 e1b2e8f4cf1..7afaddfa8b4 100644
--- 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 f29278e59ae..27e6a2aa6c2 100644
--- 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 3617769b872..6983f832393 100644
--- 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 6e6bba1dc50..0e12196051f 100644
--- 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 35fda9aeac0..c02840c9fd8 100644
--- 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 c57d71c333e..f78e4ce9343 100644
--- 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 942bd4a30cc..dcc1e50070d 100644
--- 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 098f110a70a..5d57824f80d 100644
--- 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 938137b4782..c68a82fb8c8 100644
--- 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 938137b4782..c68a82fb8c8 100644
--- 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 a5ec593268f..3a568be54c8 100644
--- 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 374d2b24f08..5b8f3cd046c 100644
--- 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 6939692204f..b48d250acaa 100644
--- 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
index 00000000000..8789d59486d
--- /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 ce380e8e86c..1afe96c55c5 100644
--- 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 b0c7ac94eb8..8cdd6772ce2 100644
--- 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 ff137839e05..63b2c388781 100644
--- 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 f44bf0fccd1..99f1f1b0bd7 100644
--- 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 af42d8ac7a3..8a8677eb8ad 100644
--- 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 c6b6f214611..26cfaecff55 100644
--- 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 2707b2f9cd5..865f476f867 100644
--- 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 812f5a7452b..4d3c379fea5 100644
--- 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 4644c4b315e..5119dd45c57 100644
--- 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 1cff4867ca0..7a280fa52b6 100644
--- 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 fc563ef376a..35486efd650 100644
--- 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 6fd8b2b3069..1aa94275af2 100644
--- 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 ec48c8b1855..82aeab40ca1 100644
--- 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 7d05f81ce71..e48cccd9e4a 100644
--- 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 57a7c8e0191..3c03568a481 100644
--- 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 afd7cebe690..cb0d74e8b18 100644
--- 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 2f9d5a58709..1d1e874b079 100644
--- 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 609e9bda87b..8e2a411de92 100644
--- 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 54bf38bb28f..6aed4c7508c 100644
--- 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 d35836a3006..09140f48496 100644
--- 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 b1de89b3067..bd808bd1645 100644
--- 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 023402c8d1b..53ebfd57a66 100644
--- 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 0abcffe1af9..4f3f7f1c50b 100644
--- 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 d88f4f5d439..ce07ae13a7f 100644
--- 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 381c5993068..963b4d2ea2b 100644
--- 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 3daba8cc287..d19f185d63b 100644
--- 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 bff1ed1ba8e..2739c7f10f6 100644
--- 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 e44cbf283d1..fe66971b590 100644
--- 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]"