fix rdl for meta string fields so they can be unset (#2515)

Signed-off-by: Henry Avetisyan <hga@yahooinc.com> Co-authored-by: Henry Avetisyan <hga@yahooinc.com>
AthenZ · Feb 21, 2024 · a16b687 · a16b687
1 parent addfcbf
commit a16b687
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 68 deletions.
diff --git a/clients/go/zms/model.go b/clients/go/zms/model.go
diff --git a/clients/go/zms/zms_schema.go b/clients/go/zms/zms_schema.go
diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/Domain.java b/core/zms/src/main/java/com/yahoo/athenz/zms/Domain.java
@@ -55,7 +55,7 @@ public class Domain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer roleCertExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -94,7 +94,7 @@ public class Domain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, String> contacts;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String environment;
     public String name;
     @RdlOptional

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/DomainData.java b/core/zms/src/main/java/com/yahoo/athenz/zms/DomainData.java
@@ -51,7 +51,7 @@ public class DomainData {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer roleCertExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -90,7 +90,7 @@ public class DomainData {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, String> contacts;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String environment;
     public String name;
     public List<Role> roles;

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/DomainMeta.java b/core/zms/src/main/java/com/yahoo/athenz/zms/DomainMeta.java
@@ -51,7 +51,7 @@ public class DomainMeta {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer roleCertExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -90,7 +90,7 @@ public class DomainMeta {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, String> contacts;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String environment;
 
     public DomainMeta setDescription(String description) {

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/Group.java b/core/zms/src/main/java/com/yahoo/athenz/zms/Group.java
@@ -21,13 +21,13 @@ public class Group {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Boolean reviewEnabled;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String notifyRoles;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityFilter;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityExpiration;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/GroupMeta.java b/core/zms/src/main/java/com/yahoo/athenz/zms/GroupMeta.java
@@ -21,13 +21,13 @@ public class GroupMeta {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Boolean reviewEnabled;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String notifyRoles;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityFilter;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityExpiration;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/Role.java b/core/zms/src/main/java/com/yahoo/athenz/zms/Role.java
@@ -33,7 +33,7 @@ public class Role {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer certExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -48,13 +48,13 @@ public class Role {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Boolean reviewEnabled;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String notifyRoles;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityFilter;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityExpiration;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -66,7 +66,7 @@ public class Role {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, TagValueList> tags;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String description;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/RoleMeta.java b/core/zms/src/main/java/com/yahoo/athenz/zms/RoleMeta.java
@@ -27,7 +27,7 @@ public class RoleMeta {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer certExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -42,13 +42,13 @@ public class RoleMeta {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Boolean reviewEnabled;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String notifyRoles;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityFilter;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String userAuthorityExpiration;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -60,7 +60,7 @@ public class RoleMeta {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, TagValueList> tags;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String description;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/SubDomain.java b/core/zms/src/main/java/com/yahoo/athenz/zms/SubDomain.java
@@ -51,7 +51,7 @@ public class SubDomain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer roleCertExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -90,7 +90,7 @@ public class SubDomain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, String> contacts;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String environment;
     public String name;
     public List<String> adminUsers;

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/TopLevelDomain.java b/core/zms/src/main/java/com/yahoo/athenz/zms/TopLevelDomain.java
@@ -52,7 +52,7 @@ public class TopLevelDomain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer roleCertExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -91,7 +91,7 @@ public class TopLevelDomain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, String> contacts;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String environment;
     public String name;
     public List<String> adminUsers;

diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/UserDomain.java b/core/zms/src/main/java/com/yahoo/athenz/zms/UserDomain.java
@@ -51,7 +51,7 @@ public class UserDomain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Integer roleCertExpiryMins;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String signAlgorithm;
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -90,7 +90,7 @@ public class UserDomain {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public Map<String, String> contacts;
     @RdlOptional
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public String environment;
     public String name;
     @RdlOptional