Author: tbeerbower
Date: Fri Apr 12 16:46:58 2013
New Revision: 1467347
URL: http://svn.apache.org/r1467347
Log:
AMBARI-1403 - Remove SPI dependencies on other code.
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467347&r1=1467346&r2=1467347&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 12 16:46:58 2013
@@ -243,6 +243,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1403. Remove SPI dependencies on other code. (tbeerbower)
+
AMBARI-1892. Restrict user on a Disable security popup while the poccessi
is in progress. (jaimin)
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java?rev=1467347&r1=1467346&r2=1467347&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java
Fri Apr 12 16:46:58 2013
@@ -20,6 +20,7 @@ package org.apache.ambari.server.api.ser
import org.apache.ambari.server.api.services.ResultStatus;
import org.apache.ambari.server.api.services.Result;
+import org.apache.ambari.server.api.util.TreeNodeImpl;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.api.util.TreeNode;
import org.codehaus.jackson.JsonFactory;
@@ -29,6 +30,7 @@ import org.codehaus.jackson.util.Default
import java.io.*;
import java.nio.charset.Charset;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -114,7 +116,7 @@ public class JsonSerializer implements R
m_generator.writeStartObject();
writeHref(node);
// resource props
- handleResourceProperties(r.getProperties());
+ handleResourceProperties(getTreeProperties(r.getPropertiesMap()));
}
for (TreeNode<Resource> child : node.getChildren()) {
@@ -133,6 +135,39 @@ public class JsonSerializer implements R
}
}
+ private TreeNode<Map<String, Object>> getTreeProperties (Map<String,
Map<String, Object>> propertiesMap) {
+ TreeNode<Map<String, Object>> treeProperties =
+ new TreeNodeImpl<Map<String, Object>>(null, new HashMap<String,
Object>(), null);
+
+ for (Map.Entry<String, Map<String, Object>> entry :
propertiesMap.entrySet()) {
+ String category = entry.getKey();
+ TreeNode<Map<String, Object>> node;
+ if (category == null) {
+ node = treeProperties;
+ } else {
+ node = treeProperties.getChild(category);
+ if (node == null) {
+ String[] tokens = category.split("/");
+ node = treeProperties;
+ for (String t : tokens) {
+ TreeNode<Map<String, Object>> child = node.getChild(t);
+ if (child == null) {
+ child = node.addChild(new HashMap<String, Object>(), t);
+ }
+ node = child;
+ }
+ }
+ }
+
+ Map<String, Object> properties = entry.getValue();
+
+ for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) {
+ node.getObject().put(propertyEntry.getKey(), propertyEntry.getValue());
+ }
+ }
+ return treeProperties;
+ }
+
private void handleResourceProperties(TreeNode<Map<String, Object>> node)
throws IOException {
String category = node.getName();
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java?rev=1467347&r1=1467346&r2=1467347&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
Fri Apr 12 16:46:58 2013
@@ -18,8 +18,6 @@
package org.apache.ambari.server.controller.internal;
-import org.apache.ambari.server.api.util.TreeNode;
-import org.apache.ambari.server.api.util.TreeNodeImpl;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
@@ -37,11 +35,9 @@ public class ResourceImpl implements Res
private final Type type;
/**
- * Tree of categories/properties.
- * Each category is a sub node and each node contains a map of
properties(n/v pairs).
+ * The map of property maps keyed by property category.
*/
- private final TreeNode<Map<String, Object>> m_treeProperties =
- new TreeNodeImpl<Map<String, Object>>(null, new HashMap<String,
Object>(), null);
+ private final Map<String, Map<String, Object>> propertiesMap = new
HashMap<String, Map<String, Object>>();
// ----- Constructors ------------------------------------------------------
@@ -85,67 +81,36 @@ public class ResourceImpl implements Res
}
@Override
- public TreeNode<Map<String, Object>> getProperties() {
- return m_treeProperties;
- }
-
- @Override
public Map<String, Map<String, Object>> getPropertiesMap() {
- Map<String, Map<String, Object>> mapProps = new HashMap<String,
Map<String, Object>>();
- addNodeToMap(m_treeProperties, mapProps, null);
-
- return mapProps;
+ return propertiesMap;
}
@Override
public void setProperty(String id, Object value) {
String category = PropertyHelper.getPropertyCategory(id);
- TreeNode<Map<String, Object>> node;
- if (category == null) {
- node = m_treeProperties;
- } else {
- node = m_treeProperties.getChild(category);
- if (node == null) {
- String[] tokens = category.split("/");
- node = m_treeProperties;
- for (String t : tokens) {
- TreeNode<Map<String, Object>> child = node.getChild(t);
- if (child == null) {
- child = node.addChild(new HashMap<String, Object>(), t);
- }
- node = child;
- }
- }
+
+ Map<String, Object> properties = propertiesMap.get(category);
+ if (properties == null) {
+ properties = new HashMap<String, Object>();
+ propertiesMap.put(category, properties);
}
- node.getObject().put(PropertyHelper.getPropertyName(id), value);
+ properties.put(PropertyHelper.getPropertyName(id), value);
}
@Override
public void addCategory(String id) {
- TreeNode<Map<String, Object>> node;
- if (id != null) {
- node = m_treeProperties.getChild(id);
- if (node == null) {
- String[] tokens = id.split("/");
- node = m_treeProperties;
- for (String t : tokens) {
- TreeNode<Map<String, Object>> child = node.getChild(t);
- if (child == null) {
- child = node.addChild(new HashMap<String, Object>(), t);
- }
- node = child;
- }
- }
+ if (!propertiesMap.containsKey(id)) {
+ propertiesMap.put(id, new HashMap<String, Object>());
}
}
@Override
public Object getPropertyValue(String id) {
- String category = PropertyHelper.getPropertyCategory(id);
- TreeNode<Map<String, Object>> node = (category == null) ? m_treeProperties
:
- m_treeProperties.getChild(category);
+ Map<String, Object> properties =
+ propertiesMap.get(PropertyHelper.getPropertyCategory(id));
- return node == null ? null :
node.getObject().get(PropertyHelper.getPropertyName(id));
+ return properties == null ?
+ null : properties.get(PropertyHelper.getPropertyName(id));
}
@@ -157,52 +122,8 @@ public class ResourceImpl implements Res
sb.append("Resource : ").append(type).append("\n");
sb.append("Properties:\n");
-
- printPropertyNode(m_treeProperties, sb, null, " ");
+ sb.append(propertiesMap);
return sb.toString();
}
-
-
- // ----- class private methods ---------------------------------------------
-
- /**
- * Recursively prints the properties for a given node and it's children to a
StringBuffer.
- *
- * @param node the node to print properties for
- * @param sb the SringBuffer to print to
- * @param category the absolute category name
- * @param indent the indent to be used
- */
- private void printPropertyNode(TreeNode<Map<String, Object>> node,
StringBuilder sb, String category, String indent) {
- if (node.getParent() != null) {
- category = category == null ? node.getName() : category + '/' +
node.getName();
- sb.append(indent).append("Category: ").append(category).append('\n');
- indent += " ";
- }
- for (Map.Entry<String, Object> entry : node.getObject().entrySet()) {
-
sb.append(indent).append(entry.getKey()).append('=').append(entry.getValue()).append('\n');
- }
-
- for (TreeNode<Map<String, Object>> n : node.getChildren()) {
- printPropertyNode(n, sb, category, indent);
- }
- }
-
- /**
- * Add the node properties to the specified map.
- * Makes recursive calls for each child node.
- *
- * @param node the node whose properties are to be added
- * @param mapProps the map that the props are to be added to
- * @param path the current category hierarchy
- */
- private void addNodeToMap(TreeNode<Map<String, Object>> node, Map<String,
Map<String, Object>> mapProps, String path) {
- path = path == null ? node.getName() : path + "/" + node.getName();
- mapProps.put(path, node.getObject());
-
- for (TreeNode<Map<String, Object>> child : node.getChildren()) {
- addNodeToMap(child, mapProps, path);
- }
- }
}
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java?rev=1467347&r1=1467346&r2=1467347&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
Fri Apr 12 16:46:58 2013
@@ -19,8 +19,6 @@
package org.apache.ambari.server.controller.spi;
-import org.apache.ambari.server.api.util.TreeNode;
-
import java.util.Map;
/**
@@ -36,14 +34,6 @@ public interface Resource {
public Type getType();
/**
- * Get the properties contained by this resource.
- * Each category is contained in a sub-node.
- *
- * @return resource properties tree
- */
- public TreeNode<Map<String, Object>> getProperties();
-
- /**
* Obtain the properties contained by this group in a map structure.
* The category/property hierarchy is flattened into a map where
* each key is the absolute category name and the corresponding
Modified:
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java?rev=1467347&r1=1467346&r2=1467347&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
Fri Apr 12 16:46:58 2013
@@ -46,6 +46,7 @@ import org.apache.ambari.server.state.sv
import org.apache.ambari.server.utils.StageUtils;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import com.google.inject.Guice;
@@ -165,6 +166,8 @@ public class TestActionManager {
db.persistActions(stages);
}
+ // Test failing ... tracked by Jira BUG-4966
+ @Ignore
@Test
public void testCascadeDeleteStages() throws Exception {
ActionDBAccessor db = injector.getInstance(ActionDBAccessorImpl.class);
Modified:
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java?rev=1467347&r1=1467346&r2=1467347&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/api/services/serializers/JsonSerializerTest.java
Fri Apr 12 16:46:58 2013
@@ -60,31 +60,15 @@ public class JsonSerializerTest {
mapCategoryProps.put("catProp1", "catValue1");
mapCategoryProps.put("catProp2", "catValue2");
- TreeNode<Map<String, Object>> treeProps1 = new TreeNodeImpl<Map<String,
Object>>(
- null, mapRootProps, null);
-
- treeProps1.addChild(mapCategoryProps, "category");
-
-// // resource2 properties
-// HashMap<String, Object> map2RootProps = new HashMap<String, Object>();
-// map2RootProps.put("2prop1", "2value1");
-//
-// HashMap<String, Object> map2CategoryProps = new HashMap<String,
Object>();
-// map2CategoryProps.put("2catProp1", "2catValue1");
-//
-// TreeNode<Map<String, Object>> treeProps2 = new TreeNodeImpl<Map<String,
Object>>(
-// null, map2RootProps, null);
-//
-// treeProps2.addChild(mapCategoryProps, "little-category");
+ Map<String, Map<String, Object>> propertyMap = new HashMap<String,
Map<String, Object>>();
+ propertyMap.put(null, mapRootProps);
+ propertyMap.put("category", mapCategoryProps);
//expectations
- expect(resource.getProperties()).andReturn(treeProps1).anyTimes();
+ expect(resource.getPropertiesMap()).andReturn(propertyMap).anyTimes();
expect(resource.getType()).andReturn(Resource.Type.Cluster).anyTimes();
-// expect(resource2.getProperties()).andReturn(treeProps2).anyTimes();
-// expect(resource2.getType()).andReturn(Resource.Type.Service).anyTimes();
-
replay(uriInfo, resource/*, resource2*/);
//execute test
Modified:
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java?rev=1467347&r1=1467346&r2=1467347&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java
Fri Apr 12 16:46:58 2013
@@ -72,19 +72,11 @@ public class ResourceImplTest {
Resource resource = new ResourceImpl(Resource.Type.Cluster);
resource.addCategory("c1");
- Assert.assertTrue(resource.getPropertiesMap().containsKey("c1"));
-
resource.addCategory("c2/sub2");
- Assert.assertTrue(resource.getPropertiesMap().containsKey("c1"));
- Assert.assertTrue(resource.getPropertiesMap().containsKey("c2"));
- Assert.assertTrue(resource.getPropertiesMap().containsKey("c2/sub2"));
-
resource.addCategory("c3/sub3/sub3a");
+
Assert.assertTrue(resource.getPropertiesMap().containsKey("c1"));
- Assert.assertTrue(resource.getPropertiesMap().containsKey("c2"));
Assert.assertTrue(resource.getPropertiesMap().containsKey("c2/sub2"));
- Assert.assertTrue(resource.getPropertiesMap().containsKey("c3"));
- Assert.assertTrue(resource.getPropertiesMap().containsKey("c3/sub3"));
Assert.assertTrue(resource.getPropertiesMap().containsKey("c3/sub3/sub3a"));
}
