You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by be...@apache.org on 2017/11/14 11:14:48 UTC
[15/17] ambari git commit: AMBARI-22325 Yet another fix for v2
blueprint json serialization/deserialization (benyoka)
AMBARI-22325 Yet another fix for v2 blueprint json serialization/deserialization (benyoka)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1a121106
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a121106
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a121106
Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: 1a121106e94306943795522d7578e938e418dd02
Parents: bc08e24
Author: Balazs Bence Sari <be...@apache.org>
Authored: Mon Nov 13 11:20:21 2017 +0100
Committer: Balazs Bence Sari <be...@apache.org>
Committed: Tue Nov 14 11:31:16 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/ambari/server/topology/Service.java | 1 +
.../ambari/server/topology/validators/BlueprintImplV2Test.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a121106/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
index 7c5ee42..90b4764 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
@@ -165,6 +165,7 @@ public class Service implements Configurable {
'}';
}
+ @JsonIgnore
public String getServiceGroupName() {
if (serviceGroup != null) {
return serviceGroup.getName();
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a121106/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/BlueprintImplV2Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/BlueprintImplV2Test.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/BlueprintImplV2Test.java
index 99acfb7..611ada1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/BlueprintImplV2Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/BlueprintImplV2Test.java
@@ -97,6 +97,7 @@ public class BlueprintImplV2Test {
String bpSerialized = bpFactory.convertToJson(bp);
System.out.println(bpSerialized);
bp = (BlueprintImplV2)bpFactory.convertFromJson(bpSerialized);
+ System.out.println(bp);
}