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/31b15fba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31b15fba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31b15fba

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: 31b15fba09b898f5fe0f9d50e6fbc1f89fc95142
Parents: be519e0
Author: Balazs Bence Sari <beny...@apache.org>
Authored: Mon Nov 13 11:20:21 2017 +0100
Committer: Doroszlai, Attila <adorosz...@hortonworks.com>
Committed: Fri Dec 8 20:24:24 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/31b15fba/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/31b15fba/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);
   }
 
 

Reply via email to