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/13 10:20:42 UTC
ambari git commit: AMBARI-22325 Yet another fix for v2 blueprint json
serialization/deserialization (benyoka)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-14714-blueprintv2 4b6c98401 -> 5574443c7
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/5574443c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5574443c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5574443c
Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: 5574443c7a45015f78859b0f150bdb15523a9b0d
Parents: 4b6c984
Author: Balazs Bence Sari <be...@apache.org>
Authored: Mon Nov 13 11:20:21 2017 +0100
Committer: Balazs Bence Sari <be...@apache.org>
Committed: Mon Nov 13 11:20:35 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/5574443c/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/5574443c/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);
}