SONAR-4282 renamed openIssues by unresolvedIssues

9 files changed, 26 insertions, 26 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java b/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java
index 328b6189191..0dc6db2e6f7 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java
@@ -38,7 +38,7 @@ public class ActionPlanStats implements Serializable {
   private Date createdAt;
   private Date updatedAt;
   private int totalIssues;
-  private int openIssues;
+  private int unresolvedIssues;
 
   private ActionPlanStats() {
 
@@ -144,17 +144,17 @@ public class ActionPlanStats implements Serializable {
     return this;
   }
 
-  public int openIssues() {
-    return openIssues;
+  public int unresolvedIssues() {
+    return unresolvedIssues;
   }
 
-  public ActionPlanStats setOpenIssues(int openIssues) {
-    this.openIssues = openIssues;
+  public ActionPlanStats setUnresolvedIssues(int unresolvedIssues) {
+    this.unresolvedIssues = unresolvedIssues;
     return this;
   }
 
   public int resolvedIssues() {
-    return totalIssues - openIssues;
+    return totalIssues - unresolvedIssues;
   }
 
   public boolean isOpen(){
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java
index cb4d04ef00c..e68d9def490 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java
@@ -42,7 +42,7 @@ public class ActionPlanStatsDto {
   private Date createdAt;
   private Date updatedAt;
   private int totalIssues;
-  private int openIssues;
+  private int unresolvedIssues;
   // joins
   private transient String projectKey;
 
@@ -145,12 +145,12 @@ public class ActionPlanStatsDto {
     return this;
   }
 
-  public int getOpenIssues() {
-    return openIssues;
+  public int getUnresolvedIssues() {
+    return unresolvedIssues;
   }
 
-  public ActionPlanStatsDto setOpenIssues(int openIssues) {
-    this.openIssues = openIssues;
+  public ActionPlanStatsDto setUnresolvedIssues(int unresolvedIssues) {
+    this.unresolvedIssues = unresolvedIssues;
     return this;
   }
 
@@ -182,7 +182,7 @@ public class ActionPlanStatsDto {
              .setCreatedAt(createdAt)
              .setUpdatedAt(updatedAt)
              .setTotalIssues(totalIssues)
-             .setOpenIssues(openIssues);
+             .setUnresolvedIssues(unresolvedIssues);
   }
 
 }
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanStatsMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanStatsMapper.xml
index bbe19b21f49..8919d819e67 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanStatsMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanStatsMapper.xml
@@ -19,7 +19,7 @@
   </sql>
 
   <select id="findByProjectId" parameterType="map" resultType="ActionPlanStats">
-    select <include refid="actionPlanColumns"/>, count(total_issues.id) as totalIssues, count(open_issues.id) as openIssues
+    select <include refid="actionPlanColumns"/>, count(total_issues.id) as totalIssues, count(open_issues.id) as unresolvedIssues
     from action_plans ap
     left join projects p on p.id = ap.project_id
     left join issues total_issues on total_issues.action_plan_key = ap.kee
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanStatsDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanStatsDaoTest.java
index a346e4bfa44..3be5466a397 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanStatsDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanStatsDaoTest.java
@@ -47,7 +47,7 @@ public class ActionPlanStatsDaoTest extends AbstractDaoTestCase {
     ActionPlanStatsDto actionPlanStatsDto = result.iterator().next();
     assertThat(actionPlanStatsDto.getProjectKey()).isEqualTo("org.sonar.Sample");
     assertThat(actionPlanStatsDto.getTotalIssues()).isEqualTo(3);
-    assertThat(actionPlanStatsDto.getOpenIssues()).isEqualTo(1);
+    assertThat(actionPlanStatsDto.getUnresolvedIssues()).isEqualTo(1);
   }
 
 }
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb
index 2121ce968b6..bb8ed4d0afd 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/action_plans_controller.rb
@@ -167,7 +167,7 @@ class Api::ActionPlansController < Api::ApiController
     hash[:userLogin] = action_plan.userLogin() if action_plan.userLogin()
     hash[:deadLine] = Api::Utils.format_datetime(action_plan.deadLine()) if action_plan.deadLine()
     hash[:totalIssues] = action_plan.totalIssues() if action_plan.respond_to?('totalIssues')
-    hash[:openIssues] = action_plan.openIssues() if action_plan.respond_to?('openIssues')
+    hash[:unresolvedIssues] = action_plan.unresolvedIssues() if action_plan.respond_to?('unresolvedIssues')
     hash[:createdAt] = Api::Utils.format_datetime(action_plan.createdAt()) if action_plan.createdAt()
     hash[:updatedAt] = Api::Utils.format_datetime(action_plan.updatedAt()) if action_plan.updatedAt()
     hash
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/_progress.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/_progress.html.erb
index 24fdaf37f09..9df56145ed1 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/_progress.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/_progress.html.erb
@@ -14,10 +14,10 @@
       tooltip_resolved = message('issues_action_plans.resolved_issues_x_percent', :params => [percent_resolved.to_s, action_plan.resolvedIssues().to_s])
     end
   
-    if action_plan.openIssues() > 0
+    if action_plan.unresolvedIssues() > 0
       open_reviews_url = url_for options.merge({:statuses => "#{Review::STATUS_OPEN},#{Review::STATUS_REOPENED}"})
-      percent_open = (action_plan.openIssues()*100/action_plan.totalIssues()).to_i
-      tooltip_open = message('issues_action_plans.open_issues_x_percent', :params => [percent_open.to_s, action_plan.openIssues().to_s])
+      percent_open = (action_plan.unresolvedIssues()*100/action_plan.totalIssues()).to_i
+      tooltip_open = message('issues_action_plans.open_issues_x_percent', :params => [percent_open.to_s, action_plan.unresolvedIssues().to_s])
     end
 %>
 
@@ -30,7 +30,7 @@
           <a href="#" title="<%= tooltip_resolved -%>" alt="<%= tooltip_resolved -%>"></a>
         </td>
         <% end %>
-        <% if action_plan.openIssues() > 0 %>
+        <% if action_plan.unresolvedIssues() > 0 %>
         <td class="open" style="width:<%= percent_open -%>%;">
           <a href="#" title="<%= tooltip_open -%>" alt="<%= tooltip_open -%>"></a>
         </td>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/index.html.erb
index 11d246102bb..ffcb7cefc04 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues_action_plans/index.html.erb
@@ -44,7 +44,7 @@
               &nbsp;
               <%
                  close_confirmation_message = {}
-                 if plan.isOpen() && plan.openIssues() > 0
+                 if plan.isOpen() && plan.unresolvedIssues() > 0
                    close_confirmation_message = {:confirm => message('issues_action_plans.confirm_close')}
                  end
               %>
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/ActionPlan.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/ActionPlan.java
index 84c03ac0589..d7c40630111 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/ActionPlan.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/ActionPlan.java
@@ -87,8 +87,8 @@ public class ActionPlan {
   }
 
   @CheckForNull
-  public Integer openIssues() {
-    return JsonUtils.getInteger(json, "openIssues");
+  public Integer unresolvedIssues() {
+    return JsonUtils.getInteger(json, "unresolvedIssues");
   }
 
 }
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/DefaultActionPlanClientTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/DefaultActionPlanClientTest.java
index 34fc84b3695..a9b29aa8370 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/DefaultActionPlanClientTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/DefaultActionPlanClientTest.java
@@ -44,8 +44,8 @@ public class DefaultActionPlanClientTest {
                               "\"project\": \"com.sonarsource.it.samples:simple-sample\",\n" +
                               "\"userLogin\": \"admin\",\n" +
                               "\"deadLine\": \"2013-05-30T00:00:00+0200\",\n" +
-                              "\"totalIssues\": 0,\n" +
-                              "\"openIssues\": 0,\n" +
+                              "\"totalIssues\": 3,\n" +
+                              "\"unresolvedIssues\": 2,\n" +
                               "\"createdAt\": \"2013-05-13T12:50:29+0200\",\n" +
                               "\"updatedAt\": \"2013-05-13T12:50:44+0200\"}]}");
 
@@ -61,8 +61,8 @@ public class DefaultActionPlanClientTest {
     assertThat(actionPlan.status()).isEqualTo("CLOSED");
     assertThat(actionPlan.userLogin()).isEqualTo("admin");
     assertThat(actionPlan.deadLine()).isNotNull();
-    assertThat(actionPlan.totalIssues()).isEqualTo(0);
-    assertThat(actionPlan.openIssues()).isEqualTo(0);
+    assertThat(actionPlan.totalIssues()).isEqualTo(3);
+    assertThat(actionPlan.unresolvedIssues()).isEqualTo(2);
     assertThat(actionPlan.createdAt()).isNotNull();
     assertThat(actionPlan.updatedAt()).isNotNull();
   }