You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/04/14 10:44:16 UTC
ambari git commit: AMBARI-10435 Set default cardinality for
ComponentInfo if not specified in metainfo.xml (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 85acd9fa9 -> 31b1700e4
AMBARI-10435 Set default cardinality for ComponentInfo if not specified in metainfo.xml (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31b1700e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31b1700e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31b1700e
Branch: refs/heads/trunk
Commit: 31b1700e4628fbf3815b95aa82c9487be3f42a62
Parents: 85acd9f
Author: Dmytro Sen <ds...@apache.org>
Authored: Tue Apr 14 11:43:57 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Tue Apr 14 11:43:57 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ambari/server/state/ComponentInfo.java | 4 ++--
.../java/org/apache/ambari/server/stack/ComponentModuleTest.java | 2 +-
.../java/org/apache/ambari/server/stack/ServiceModuleTest.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/31b1700e/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
index 624227e..05c0df7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
@@ -32,7 +32,7 @@ public class ComponentInfo {
private String displayName;
private String category;
private boolean deleted;
- private String cardinality;
+ private String cardinality = "0+";
/**
* Technically, no component is required to advertise a version. In practice,
@@ -231,7 +231,7 @@ public class ComponentInfo {
public void setCardinality(String cardinality) {
this.cardinality = cardinality;
}
-
+
public String getCardinality() {
return cardinality;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/31b1700e/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
index 42d6944..2f84f04 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
@@ -158,7 +158,7 @@ public class ComponentModuleTest {
// parent has value set, child value is null
parentInfo.setCardinality(cardinality);
- assertEquals(cardinality, resolveComponent(info, parentInfo).getModuleInfo().getCardinality());
+ assertEquals("0+", resolveComponent(info, parentInfo).getModuleInfo().getCardinality());
// child has value set, parent value is null
info.setCardinality(cardinality);
http://git-wip-us.apache.org/repos/asf/ambari/blob/31b1700e/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java
index 1ae4cd1..95dc587 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java
@@ -538,7 +538,6 @@ public class ServiceModuleTest {
// both non-intersecting components 2 and 4 should be included
ComponentInfo info1 = new ComponentInfo();
info1.setName("1");
- info1.setCardinality("ALL");
ComponentInfo info2 = new ComponentInfo();
info2.setName("2");
ComponentInfo XX = new ComponentInfo();
@@ -547,6 +546,7 @@ public class ServiceModuleTest {
ComponentInfo info3 = new ComponentInfo();
// overlaps with info1
info3.setName("1");
+ info3.setCardinality("ALL");
info3.setCategory("category");
ComponentInfo info4 = new ComponentInfo();
info4.setName("4");