SONAR-5646 fix api/dashboards/show (bad git merge)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java
index 7acd75b8480f93fdbf378aa5c4119ec1779ed679..ca7b10d9e5f5975a3c4c0c7070ef6edf86c3cad8 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java
@@ -29,7 +29,7 @@ import java.util.Collection;
 
 public class WidgetDao extends BaseDao<WidgetMapper, WidgetDto, Long> {
 
-  protected WidgetDao(System2 system2) {
+  public WidgetDao(System2 system2) {
     super(WidgetMapper.class, system2);
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java
index e44e4e05a7bd9143addda1fea5f2848a7de96887..ae85a6fd3862119278fa6c41f8d84eb583d0365f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java
@@ -29,7 +29,7 @@ import java.util.Collection;
 
 public class WidgetPropertyDao extends BaseDao<WidgetPropertyMapper, WidgetPropertyDto, Long> {
 
-  protected WidgetPropertyDao(System2 system2) {
+  public WidgetPropertyDao(System2 system2) {
     super(WidgetPropertyMapper.class, system2);
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
index 1d95ff8d1a691a9c120a7ec624115460142c0cb2..50da0a6d5959865fa979ed6ed3c9d4b8419ddcde 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -103,6 +103,8 @@ import org.sonar.server.computation.ComputationService;
 import org.sonar.server.computation.db.AnalysisReportDao;
 import org.sonar.server.config.ws.PropertiesWs;
 import org.sonar.server.dashboard.db.DashboardDao;
+import org.sonar.server.dashboard.db.WidgetDao;
+import org.sonar.server.dashboard.db.WidgetPropertyDao;
 import org.sonar.server.dashboard.ws.DashboardsShowAction;
 import org.sonar.server.dashboard.ws.DashboardsWebService;
 import org.sonar.server.db.DatabaseChecker;
@@ -372,6 +374,8 @@ class ServerComponents {
       DashboardDao.class,
       DashboardsWebService.class,
       DashboardsShowAction.class,
+      WidgetDao.class,
+      WidgetPropertyDao.class,
 
       // rules/qprofiles
       RuleNormalizer.class,

diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyMapper.java b/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyMapper.java
index 214d95f0da4766470d3dc587d95e87a8d729b463..eef4681890482b0d9db9584b16ad1aa0b973c845 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyMapper.java
@@ -29,7 +29,7 @@ import java.util.Collection;
 
 public interface WidgetPropertyMapper {
 
-  String COLUMNS = "wp.id, wp.widget_id as \"widgetId\", wp.key as \"propertyKey\", wp.text_value as \"textValue\"";
+  String COLUMNS = "wp.id, wp.widget_id as \"widgetId\", wp.kee as \"propertyKey\", wp.text_value as \"textValue\"";
 
   @Insert("insert into widget_properties (widget_id, kee, text_value) values (#{widgetId}, #{propertyKey}, #{textValue})")
   @Options(keyColumn = "id", useGeneratedKeys = true, keyProperty = "id")