You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/04/15 21:20:52 UTC
ambari git commit: AMBARI-10484. Change response structure for widget
layout API.
Repository: ambari
Updated Branches:
refs/heads/trunk 9420d3816 -> b92bfc352
AMBARI-10484. Change response structure for widget layout API.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b92bfc35
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b92bfc35
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b92bfc35
Branch: refs/heads/trunk
Commit: b92bfc352d41a84327824fcba34fa44c541db795
Parents: 9420d38
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Apr 15 12:20:45 2015 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Apr 15 12:20:45 2015 -0700
----------------------------------------------------------------------
.../WidgetLayoutResourceDefinition.java | 8 +++---
.../internal/WidgetLayoutResourceProvider.java | 28 ++++++++++----------
.../WidgetLayoutResourceProviderTest.java | 12 ++++-----
3 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b92bfc35/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java
index 2d2ca1e..a9bbd9c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java
@@ -68,13 +68,13 @@ public class WidgetLayoutResourceDefinition extends BaseResourceDefinition {
TreeNode<Resource> parent = resultNode.getParent();
for (TreeNode<Resource> node : parent.getChildren()) {
- if (node.getObject().getPropertiesMap().get("WidgetLayouts") != null &&
- node.getObject().getPropertiesMap().get("WidgetLayouts").get("WidgetInfo") != null) {
+ if (node.getObject().getPropertiesMap().get("WidgetLayoutInfo") != null &&
+ node.getObject().getPropertiesMap().get("WidgetLayoutInfo").get("widgets") != null) {
- ArrayList widgetsList = (ArrayList) node.getObject().getPropertiesMap().get("WidgetLayouts").get("WidgetInfo");
+ ArrayList widgetsList = (ArrayList) node.getObject().getPropertiesMap().get("WidgetLayoutInfo").get("widgets");
for (Object widgetObject : widgetsList) {
HashMap<String, Object> widgetMap = (HashMap) widgetObject;
- String widgetId = ((WidgetResponse) widgetMap.get("Widget")).getId().toString();
+ String widgetId = ((WidgetResponse) widgetMap.get("WidgetInfo")).getId().toString();
String widgetHref = href.substring(0, href.indexOf("/widget_layouts") + 1) +
"widgets/" + widgetId;
widgetMap.put("href", widgetHref);
http://git-wip-us.apache.org/repos/asf/ambari/blob/b92bfc35/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
index ba3bce9..8fa5bc6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
@@ -59,14 +59,14 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
// ----- Property ID constants ---------------------------------------------
- public static final String WIDGETLAYOUT_ID_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "id");
- public static final String WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "cluster_name");
- public static final String WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "section_name");
- public static final String WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "layout_name");
- public static final String WIDGETLAYOUT_SCOPE_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "scope");
- public static final String WIDGETLAYOUT_INFO_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "WidgetInfo");
- public static final String WIDGETLAYOUT_USERNAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "user_name");
- public static final String WIDGETLAYOUT_DISPLAY_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayouts", "display_name");
+ public static final String WIDGETLAYOUT_ID_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "id");
+ public static final String WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "cluster_name");
+ public static final String WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "section_name");
+ public static final String WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "layout_name");
+ public static final String WIDGETLAYOUT_SCOPE_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "scope");
+ public static final String WIDGETLAYOUT_WIDGETS_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "widgets");
+ public static final String WIDGETLAYOUT_USERNAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "user_name");
+ public static final String WIDGETLAYOUT_DISPLAY_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("WidgetLayoutInfo", "display_name");
public static enum SCOPE {
CLUSTER,
USER
@@ -86,7 +86,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
add(WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID);
add(WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID);
add(WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID);
- add(WIDGETLAYOUT_INFO_PROPERTY_ID);
+ add(WIDGETLAYOUT_WIDGETS_PROPERTY_ID);
add(WIDGETLAYOUT_SCOPE_PROPERTY_ID);
add(WIDGETLAYOUT_USERNAME_PROPERTY_ID);
add(WIDGETLAYOUT_DISPLAY_NAME_PROPERTY_ID);
@@ -133,7 +133,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID,
WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID,
WIDGETLAYOUT_SCOPE_PROPERTY_ID,
- WIDGETLAYOUT_INFO_PROPERTY_ID,
+ WIDGETLAYOUT_WIDGETS_PROPERTY_ID,
WIDGETLAYOUT_DISPLAY_NAME_PROPERTY_ID,
WIDGETLAYOUT_USERNAME_PROPERTY_ID
};
@@ -145,7 +145,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
final WidgetLayoutEntity entity = new WidgetLayoutEntity();
String userName = getUserName(properties);
- Set widgetsSet = (LinkedHashSet) properties.get(WIDGETLAYOUT_INFO_PROPERTY_ID);
+ Set widgetsSet = (LinkedHashSet) properties.get(WIDGETLAYOUT_WIDGETS_PROPERTY_ID);
String clusterName = properties.get(WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID).toString();
entity.setLayoutName(properties.get(WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID).toString());
@@ -235,10 +235,10 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
for (WidgetLayoutUserWidgetEntity widgetLayoutUserWidgetEntity : widgetLayoutUserWidgetEntityList) {
WidgetEntity widgetEntity = widgetLayoutUserWidgetEntity.getWidget();
HashMap<String, Object> widgetInfoMap = new HashMap<String, Object>();
- widgetInfoMap.put("Widget",WidgetResponse.coerce(widgetEntity));
+ widgetInfoMap.put("WidgetInfo",WidgetResponse.coerce(widgetEntity));
widgets.add(widgetInfoMap);
}
- resource.setProperty(WIDGETLAYOUT_INFO_PROPERTY_ID, widgets);
+ resource.setProperty(WIDGETLAYOUT_WIDGETS_PROPERTY_ID, widgets);
resources.add(resource);
}
@@ -278,7 +278,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
entity.setScope(propertyMap.get(WIDGETLAYOUT_SCOPE_PROPERTY_ID).toString());
}
- Set widgetsSet = (LinkedHashSet) propertyMap.get(WIDGETLAYOUT_INFO_PROPERTY_ID);
+ Set widgetsSet = (LinkedHashSet) propertyMap.get(WIDGETLAYOUT_WIDGETS_PROPERTY_ID);
List<WidgetLayoutUserWidgetEntity> widgetLayoutUserWidgetEntityList = new LinkedList<WidgetLayoutUserWidgetEntity>();
int order=0;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b92bfc35/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
index 6cb82d9..31de95b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
@@ -104,7 +104,7 @@ public class WidgetLayoutResourceProviderTest {
WidgetLayoutResourceProvider.WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID,
WidgetLayoutResourceProvider.WIDGETLAYOUT_USERNAME_PROPERTY_ID,
WidgetLayoutResourceProvider.WIDGETLAYOUT_SCOPE_PROPERTY_ID,
- WidgetLayoutResourceProvider.WIDGETLAYOUT_INFO_PROPERTY_ID);
+ WidgetLayoutResourceProvider.WIDGETLAYOUT_WIDGETS_PROPERTY_ID);
AmbariManagementController amc = createMock(AmbariManagementController.class);
Clusters clusters = createMock(Clusters.class);
@@ -134,7 +134,7 @@ public class WidgetLayoutResourceProviderTest {
Assert.assertEquals("displ_name", r.getPropertyValue(WidgetLayoutResourceProvider.WIDGETLAYOUT_DISPLAY_NAME_PROPERTY_ID));
Assert.assertEquals("layout name0", r.getPropertyValue(WidgetLayoutResourceProvider.WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID));
- Assert.assertEquals("[]", r.getPropertyValue(WidgetLayoutResourceProvider.WIDGETLAYOUT_INFO_PROPERTY_ID).toString());
+ Assert.assertEquals("[]", r.getPropertyValue(WidgetLayoutResourceProvider.WIDGETLAYOUT_WIDGETS_PROPERTY_ID).toString());
}
@@ -166,7 +166,7 @@ public class WidgetLayoutResourceProviderTest {
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_USERNAME_PROPERTY_ID, "admin");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SCOPE_PROPERTY_ID, "CLUSTER");
Set widgetsInfo = new LinkedHashSet();
- requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_INFO_PROPERTY_ID, widgetsInfo);
+ requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_WIDGETS_PROPERTY_ID, widgetsInfo);
Request request = PropertyHelper.getCreateRequest(Collections.singleton(requestProps), null);
provider.createResources(request);
@@ -212,7 +212,7 @@ public class WidgetLayoutResourceProviderTest {
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_USERNAME_PROPERTY_ID, "admin");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SCOPE_PROPERTY_ID, "CLUSTER");
Set widgetsInfo = new LinkedHashSet();
- requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_INFO_PROPERTY_ID, widgetsInfo);
+ requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_WIDGETS_PROPERTY_ID, widgetsInfo);
Request request = PropertyHelper.getCreateRequest(
Collections.singleton(requestProps), null);
@@ -245,7 +245,7 @@ public class WidgetLayoutResourceProviderTest {
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID, "layout_name_new");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SCOPE_PROPERTY_ID, "USER");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_ID_PROPERTY_ID, "1");
- requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_INFO_PROPERTY_ID, widgetsInfo);
+ requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_WIDGETS_PROPERTY_ID, widgetsInfo);
request = PropertyHelper.getUpdateRequest(requestProps, null);
@@ -285,7 +285,7 @@ public class WidgetLayoutResourceProviderTest {
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_USERNAME_PROPERTY_ID, "admin");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SCOPE_PROPERTY_ID, "CLUSTER");
Set widgetsInfo = new LinkedHashSet();
- requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_INFO_PROPERTY_ID, widgetsInfo);
+ requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_WIDGETS_PROPERTY_ID, widgetsInfo);
Request request = PropertyHelper.getCreateRequest(Collections.singleton(requestProps), null);