ambari git commit: Revert "AMBARI-19244. Create profile evaluator. (Balazs Bence Sari via stoader)"
Repository: ambari
Updated Branches:
refs/heads/trunk 2f2c9cc58 -> 163fa4c9c
Revert "AMBARI-19244. Create profile evaluator. (Balazs Bence Sari via stoader)"
This reverts commit 83f3b6fb0fb98bc99e74b0d1f2c55e5229c697ac.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/163fa4c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/163fa4c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/163fa4c9
Branch: refs/heads/trunk
Commit: 163fa4c9c2e076ca16bf1a6f05d5e695af86b7d0
Parents: 2f2c9cc
Author: Toader, Sebastian
Authored: Fri Dec 23 16:14:12 2016 +0100
Committer: Toader, Sebastian
Committed: Fri Dec 23 16:14:12 2016 +0100
--
.../ambari/server/state/quicklinks/Link.java| 16 +-
.../quicklinksprofile/AcceptAllFilter.java | 2 +-
.../state/quicklinksprofile/Component.java | 7 -
.../server/state/quicklinksprofile/Filter.java | 10 +-
.../quicklinksprofile/LinkAttributeFilter.java | 61 --
.../state/quicklinksprofile/PropertyFilter.java | 60 ++
.../quicklinksprofile/QuickLinksProfile.java| 7 -
.../QuickLinksProfileEvaluator.java | 202 --
.../QuickLinksProfileEvaluatorException.java| 27 ---
.../QuickLinksProfileParser.java| 10 +-
.../server/state/quicklinksprofile/Service.java | 8 -
.../QuickLinksConfigurationModuleTest.java | 10 +-
.../state/quicklinksprofile/EvaluatorTest.java | 204 ---
.../QuickLinksProfileEvaluatorTest.java | 167 ---
.../QuickLinksProfileParserTest.java| 4 +-
.../HIVE/0.11.0.2.0.5.0/package/.hash | 1 +
.../dummy_stack/HIVE/package/.hash | 1 +
.../child_quicklinks_with_attributes.json | 64 --
.../child_quicklinks_with_properties.json | 64 ++
.../resources/example_quicklinks_profile.json | 4 +-
.../inconsistent_quicklinks_profile.json| 2 +-
.../parent_quicklinks_with_attributes.json | 65 --
.../parent_quicklinks_with_properties.json | 65 ++
23 files changed, 220 insertions(+), 841 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/163fa4c9/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
index f589f5d..72ad764 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
@@ -50,8 +50,8 @@ public class Link{
@JsonProperty("protocol")
private Protocol protocol;
- @JsonProperty("attributes")
- private List attributes;
+ @JsonProperty("properties")
+ private List properties;
public String getName() {
return name;
@@ -110,12 +110,12 @@ public class Link{
}
@Nullable
- public List getAttributes() {
-return attributes;
+ public List getProperties() {
+return properties;
}
- public void setAttributes(List attributes) {
-this.attributes = attributes;
+ public void setProperties(List properties) {
+this.properties = properties;
}
public boolean isRemoved(){
@@ -148,8 +148,8 @@ public class Link{
port.mergetWithParent(parentLink.getPort());
}
-if (null == attributes && null != parentLink.attributes) {
- attributes = parentLink.attributes;
+if (null == properties && null != parentLink.properties) {
+ properties = parentLink.properties;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/163fa4c9/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
index d784a22..5124241 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
@@ -22,7 +22,7 @@ import org.apache.ambari.server.state.quicklinks.Link;
/**
* A filter that accepts all links. It is useful to specify a general rule
while the more specific
- * ({@link LinkNameFilter} and {@link LinkAttributeFilter}) filters handle
more special cases.
+ * ({@link LinkNameFilter} and {@link PropertyFilter}) filters handle more
special cases.
*/
public class AcceptAllFilter extends Filter {
ambari git commit: Revert "AMBARI-19244. Create profile evaluator. (Balazs Bence Sari via stoader)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 a12f05487 -> 0878b7e5f
Revert "AMBARI-19244. Create profile evaluator. (Balazs Bence Sari via stoader)"
This reverts commit 8c79bd168aaad4cc185e258ee29513bb4f9def74.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0878b7e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0878b7e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0878b7e5
Branch: refs/heads/branch-2.5
Commit: 0878b7e5faf44a60564d8c694a7f80b6e5f541f3
Parents: a12f054
Author: Toader, Sebastian
Authored: Fri Dec 23 16:11:38 2016 +0100
Committer: Toader, Sebastian
Committed: Fri Dec 23 16:11:38 2016 +0100
--
.../ambari/server/state/quicklinks/Link.java| 16 +-
.../quicklinksprofile/AcceptAllFilter.java | 2 +-
.../state/quicklinksprofile/Component.java | 7 -
.../server/state/quicklinksprofile/Filter.java | 10 +-
.../quicklinksprofile/LinkAttributeFilter.java | 61 --
.../state/quicklinksprofile/PropertyFilter.java | 60 ++
.../quicklinksprofile/QuickLinksProfile.java| 7 -
.../QuickLinksProfileEvaluator.java | 202 --
.../QuickLinksProfileEvaluatorException.java| 27 ---
.../QuickLinksProfileParser.java| 10 +-
.../server/state/quicklinksprofile/Service.java | 8 -
.../QuickLinksConfigurationModuleTest.java | 10 +-
.../state/quicklinksprofile/EvaluatorTest.java | 204 ---
.../QuickLinksProfileEvaluatorTest.java | 167 ---
.../QuickLinksProfileParserTest.java| 4 +-
.../HIVE/0.11.0.2.0.5.0/package/.hash | 1 +
.../dummy_stack/HIVE/package/.hash | 1 +
.../child_quicklinks_with_attributes.json | 64 --
.../child_quicklinks_with_properties.json | 64 ++
.../resources/example_quicklinks_profile.json | 4 +-
.../inconsistent_quicklinks_profile.json| 2 +-
.../parent_quicklinks_with_attributes.json | 65 --
.../parent_quicklinks_with_properties.json | 65 ++
23 files changed, 220 insertions(+), 841 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0878b7e5/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
index c26eda9..f7c14f3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java
@@ -51,8 +51,8 @@ public class Link{
@JsonProperty("protocol")
private Protocol protocol;
- @JsonProperty("attributes")
- private List attributes;
+ @JsonProperty("properties")
+ private List properties;
public String getName() {
return name;
@@ -111,12 +111,12 @@ public class Link{
}
@Nullable
- public List getAttributes() {
-return attributes;
+ public List getProperties() {
+return properties;
}
- public void setAttributes(List attributes) {
-this.attributes = attributes;
+ public void setProperties(List properties) {
+this.properties = properties;
}
public boolean isRemoved(){
@@ -149,8 +149,8 @@ public class Link{
port.mergetWithParent(parentLink.getPort());
}
-if (null == attributes && null != parentLink.attributes) {
- attributes = parentLink.attributes;
+if (null == properties && null != parentLink.properties) {
+ properties = parentLink.properties;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0878b7e5/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
index d784a22..5124241 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/AcceptAllFilter.java
@@ -22,7 +22,7 @@ import org.apache.ambari.server.state.quicklinks.Link;
/**
* A filter that accepts all links. It is useful to specify a general rule
while the more specific
- * ({@link LinkNameFilter} and {@link LinkAttributeFilter}) filters handle
more special cases.
+ * ({@link LinkNameFilter} and {@link PropertyFilter}) filters handle more
special cases.
*/
public class AcceptAllFilter extends
